From 5058172616dfb125747fea531f48ef0cafe44cf4 Mon Sep 17 00:00:00 2001 From: gergelylendvai Date: Fri, 7 Jan 2022 15:39:58 +0100 Subject: [PATCH] Removing field deletions and id generation --- .../36c891d9-4bd9-43ac-bad2-10e12756272c.json | 2 +- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- .../connectors/source-hubspot/Dockerfile | 2 +- .../connectors/source-hubspot/source_hubspot/api.py | 9 +++------ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/36c891d9-4bd9-43ac-bad2-10e12756272c.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/36c891d9-4bd9-43ac-bad2-10e12756272c.json index 913968015e749..5e76551413b44 100644 --- a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/36c891d9-4bd9-43ac-bad2-10e12756272c.json +++ b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/36c891d9-4bd9-43ac-bad2-10e12756272c.json @@ -2,7 +2,7 @@ "sourceDefinitionId": "36c891d9-4bd9-43ac-bad2-10e12756272c", "name": "HubSpot", "dockerRepository": "airbyte/source-hubspot", - "dockerImageTag": "0.1.29", + "dockerImageTag": "0.1.30", "documentationUrl": "https://docs.airbyte.io/integrations/sources/hubspot", "icon": "hubspot.svg" } diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 6248ea2f25633..a9dd4b39a60e9 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -287,7 +287,7 @@ - name: HubSpot sourceDefinitionId: 36c891d9-4bd9-43ac-bad2-10e12756272c dockerRepository: airbyte/source-hubspot - dockerImageTag: 0.1.29 + dockerImageTag: 0.1.30 documentationUrl: https://docs.airbyte.io/integrations/sources/hubspot icon: hubspot.svg sourceType: api diff --git a/airbyte-integrations/connectors/source-hubspot/Dockerfile b/airbyte-integrations/connectors/source-hubspot/Dockerfile index 7c35101c19b4f..c8ddb3ac162e7 100644 --- a/airbyte-integrations/connectors/source-hubspot/Dockerfile +++ b/airbyte-integrations/connectors/source-hubspot/Dockerfile @@ -34,5 +34,5 @@ COPY source_hubspot ./source_hubspot ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.29 +LABEL io.airbyte.version=0.1.30 LABEL io.airbyte.name=airbyte/source-hubspot diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/api.py b/airbyte-integrations/connectors/source-hubspot/source_hubspot/api.py index 9d0f0ecde1fd7..f4a5d02485875 100644 --- a/airbyte-integrations/connectors/source-hubspot/source_hubspot/api.py +++ b/airbyte-integrations/connectors/source-hubspot/source_hubspot/api.py @@ -10,7 +10,6 @@ from functools import lru_cache, partial from http import HTTPStatus from typing import Any, Callable, Iterable, Iterator, List, Mapping, MutableMapping, Optional, Tuple, Union -from uuid import uuid4 import backoff import pendulum as pendulum @@ -716,8 +715,9 @@ class FormSubmissionStream(Stream): def _transform(self, records: Iterable) -> Iterable: for record in super()._transform(records): keys = record.keys() - if "id" not in keys: - record["id"] = uuid4() + + # There's no updatedAt field in the submission however forms fetched by using this field, + # so it has to be added to the submissions otherwise it would fail when calling _filter_old_records if "updatedAt" not in keys: record["updatedAt"] = record["submittedAt"] @@ -726,9 +726,6 @@ def _transform(self, records: Iterable) -> Iterable: def list(self, fields) -> Iterable: for form in self.read(getter=partial(self._api.get, url="/marketing/v3/forms")): for submission in self.read(getter=partial(self._api.get, url=f"{self.url}/{form['id']}")): - del submission["id"] - del submission["updatedAt"] - submission["formId"] = form["id"] yield submission