From 0a99c92eb41e0adece18de663af22f883222897a Mon Sep 17 00:00:00 2001
From: Jun-te Kim <juntekim@googlemail.com>
Date: Wed, 27 May 2026 10:30:19 +0000
Subject: [PATCH] added batch description and nonfunded measures

---
 backend/app/db/models/hubspot_deal_data.py | 2 ++
 etl/hubspot/hubspotClient.py               | 2 ++
 etl/hubspot/hubspotDataTodB.py             | 4 ++++
 etl/hubspot/hubspot_deal_differ.py         | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/backend/app/db/models/hubspot_deal_data.py b/backend/app/db/models/hubspot_deal_data.py
index 0ee58d54..dd5cdb14 100644
--- a/backend/app/db/models/hubspot_deal_data.py
+++ b/backend/app/db/models/hubspot_deal_data.py
@@ -39,7 +39,9 @@ class HubspotDealData(SQLModel, table=True):
     damp_mould_and_repairs_comments: Optional[str] = Field(default=None)
     pre_sap: Optional[str] = Field(default=None)
     batch: Optional[str] = Field(default=None)
+    batch_description: Optional[str] = Field(default=None)
     block_reference: Optional[str] = Field(default=None)
+    nonfunded_measures: Optional[str] = Field(default=None)
     epc_prn: Optional[str] = Field(default=None)
     potential_post_sap_score_dropdown: Optional[str] = Field(default=None)
     ei_score: Optional[str] = Field(default=None)
diff --git a/etl/hubspot/hubspotClient.py b/etl/hubspot/hubspotClient.py
index 4c9cb1e6..769b8ea6 100644
--- a/etl/hubspot/hubspotClient.py
+++ b/etl/hubspot/hubspotClient.py
@@ -285,7 +285,9 @@ class HubspotClient:
                     "surveyed_date",
                     "design_type",
                     "batch",
+                    "batch_description",
                     "block_reference",
+                    "nonfunded_measures",
                     "epc_prn",
                     "potential_post_sap_score_dropdown",
                     "ei_score",
diff --git a/etl/hubspot/hubspotDataTodB.py b/etl/hubspot/hubspotDataTodB.py
index b160d563..a6e19ef4 100644
--- a/etl/hubspot/hubspotDataTodB.py
+++ b/etl/hubspot/hubspotDataTodB.py
@@ -200,7 +200,9 @@ class HubspotDataToDb:
             ),
             "pre_sap": deal_data.get("pre_sap_score_dropdown"),
             "batch": deal_data.get("batch"),
+            "batch_description": deal_data.get("batch_description"),
             "block_reference": deal_data.get("block_reference"),
+            "nonfunded_measures": deal_data.get("nonfunded_measures"),
             "epc_prn": deal_data.get("epc_prn"),
             "potential_post_sap_score_dropdown": deal_data.get(
                 "potential_post_sap_score_dropdown"
@@ -297,7 +299,9 @@ class HubspotDataToDb:
             ),
             pre_sap=deal_data.get("pre_sap_score_dropdown"),
             batch=deal_data.get("batch"),
+            batch_description=deal_data.get("batch_description"),
             block_reference=deal_data.get("block_reference"),
+            nonfunded_measures=deal_data.get("nonfunded_measures"),
             epc_prn=deal_data.get("epc_prn"),
             potential_post_sap_score_dropdown=deal_data.get(
                 "potential_post_sap_score_dropdown"
diff --git a/etl/hubspot/hubspot_deal_differ.py b/etl/hubspot/hubspot_deal_differ.py
index da0072c1..dca6e7ea 100644
--- a/etl/hubspot/hubspot_deal_differ.py
+++ b/etl/hubspot/hubspot_deal_differ.py
@@ -64,7 +64,9 @@ class HubspotDealDiffer:
             "damp_mould_and_repairs_comments": "damp_mould_and_repairs_comments",
             "pre_sap_score_dropdown": "pre_sap",
             "batch": "batch",
+            "batch_description": "batch_description",
             "block_reference": "block_reference",
+            "nonfunded_measures": "nonfunded_measures",
             "epc_prn": "epc_prn",
             "potential_post_sap_score_dropdown": "potential_post_sap_score_dropdown",
             "ei_score": "ei_score",