Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FB Marketing source - lookback window logic not functioning correctly #3395

Merged
merged 6 commits into from
May 13, 2021
Merged

FB Marketing source - lookback window logic not functioning correctly #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7b0722
FB Marketing source #1390 - returning buffered record while increment…
vitaliizazmic May 13, 2021
0ce8b8b
FB Marketing source #1390 - improving checking while syncing buffered…
vitaliizazmic May 13, 2021
e1df74f
FB Marketing source #1390 - adding loop_back to IncrementalStreamAPI
vitaliizazmic May 13, 2021
c296a67
FB Marketing source #1390 - bump version
vitaliizazmic May 13, 2021
215b0e3
FB Marketing source #1390 - add CHANGELOG.md
vitaliizazmic May 13, 2021
7411e0f
Merge branch 'master' into vitalii/2828_fb_marketing_lookback_window
vitaliizazmic May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ain/resources/config/STANDARD_SOURCE_DEFINITION/e7778cfc-e97c-4458-9ecb-b4f2bba8946c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "e7778cfc-e97c-4458-9ecb-b4f2bba8946c",
"name": "Facebook Marketing",
"dockerRepository": "airbyte/source-facebook-marketing",
"dockerImageTag": "0.2.3",
"dockerImageTag": "0.2.4",
"documentationUrl": "https://hub.docker.com/r/airbyte/source-facebook-marketing",
"icon": "facebook.svg"
}
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
- sourceDefinitionId: e7778cfc-e97c-4458-9ecb-b4f2bba8946c
name: Facebook Marketing
dockerRepository: airbyte/source-facebook-marketing
dockerImageTag: 0.2.3
dockerImageTag: 0.2.4
documentationUrl: https://hub.docker.com/r/airbyte/source-facebook-marketing
icon: facebook.svg
- sourceDefinitionId: 36c891d9-4bd9-43ac-bad2-10e12756272c
Expand Down
5 changes: 5 additions & 0 deletions airbyte-integrations/connectors/source-facebook-marketing/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Changelog

## 0.2.4
Fix an issue that caused losing Insights data from the past 28 days while incremental sync: https://github.com/airbytehq/airbyte/pull/3395

2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-facebook-marketing/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ COPY $CODE_PATH ./$CODE_PATH
COPY setup.py ./
RUN pip install .

LABEL io.airbyte.version=0.2.3
LABEL io.airbyte.version=0.2.4
LABEL io.airbyte.name=airbyte/source-facebook-marketing
4 changes: 3 additions & 1 deletion ...integrations/connectors/source-facebook-marketing/source_facebook_marketing/client/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ def list(self, fields: Sequence[str] = None) -> Iterator[dict]:


class IncrementalStreamAPI(StreamAPI, ABC):
buffer_days = -1

@property
@abstractmethod
def state_pk(self):
Expand Down Expand Up @@ -156,7 +158,7 @@ def read(self, getter: Callable, params: Mapping[str, Any] = None) -> Iterator:
latest_cursor = None
for record in super().read(getter, params):
cursor = pendulum.parse(record[self.state_pk])
if self._state and self._state >= cursor:
if self._state and self._state.subtract(days=self.buffer_days + 1) >= cursor:
continue
latest_cursor = max(cursor, latest_cursor) if latest_cursor else cursor
yield record
Expand Down