fix start_date filtering

messagebird · Nov 19, 2024 · 2b85f0d · 2b85f0d
1 parent 59be8a8
commit 2b85f0d
Showing 1 changed file with 44 additions and 30 deletions.
diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/streams.py b/airbyte-integrations/connectors/source-hubspot/source_hubspot/streams.py
@@ -1207,36 +1207,50 @@ def _process_search(
             payload["filterGroups"] = []
             for filter_group in self._stream_filter:
                 if "filters" in filter_group:
-                    payload["filterGroups"].append({
-                        "filters": [
-                            {
-                                "propertyName": filter["propertyName"],
-                                "operator": filter["operator"],
-                                "value": filter.get("value")
-                            }
-                            for filter in filter_group["filters"]
-                        ]
-                    })
-            logger.warning(f"PAYLOAD: {payload}")
-
-        # if self.state:
-        #     if "filterGroups" not in payload:
-        #         payload["filterGroups"] = []
-        #     payload["filterGroups"].append({
-        #         "filters": [
-        #             {"value": int(self._start_date.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"}
-        #         ]
-        #     })
-        # else:
-        #     if "filterGroups" not in payload:
-        #         payload["filterGroups"] = []
-        #     payload["filterGroups"].append({
-        #         "filters": [
-        #             {"value": int(self._state.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"},
-        #             {"value": int(self._init_sync.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "LTE"},
-        #             {"value": last_id, "propertyName": key, "operator": "GTE"},
-        #         ]
-        #     })
+                    if self.state:
+                        payload["filterGroups"].append({
+                            "filters": [
+                                {
+                                    "propertyName": filter["propertyName"],
+                                    "operator": filter["operator"],
+                                    "value": filter.get("value")
+                                }
+                                for filter in filter_group["filters"] + [
+                                    {"value": int(self._state.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"},
+                                    {"value": int(self._init_sync.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "LTE"},
+                                    {"value": last_id, "propertyName": key, "operator": "GTE"}
+                                ]
+                            ]
+                        })
+                    else:
+                        payload["filterGroups"].append({
+                            "filters": [
+                                {
+                                    "propertyName": filter["propertyName"],
+                                    "operator": filter["operator"],
+                                    "value": filter.get("value")
+                                }
+                                for filter in filter_group["filters"] + [
+                                    {"value": int(self._start_date.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"}
+                                ]
+                            ]
+                        })
+        else:
+            payload["filterGroups"] = []
+            if self.state:
+                payload["filterGroups"].append({
+                    "filters": [
+                        {"value": int(self._state.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"},
+                        {"value": int(self._init_sync.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "LTE"},
+                        {"value": last_id, "propertyName": key, "operator": "GTE"}
+                    ]
+                })
+            else:
+                payload["filterGroups"].append({
+                    "filters": [
+                        {"value": int(self._start_date.timestamp() * 1000), "propertyName": self.last_modified_field, "operator": "GTE"}
+                    ]
+                })
 
         if next_page_token:
             payload.update(next_page_token["payload"])