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

Pagination fix for the duplicates. #16

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Pagination fix for the duplicates. #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6030755
Pagination fix for the duplicates.
xacadil Apr 17, 2024
57728d1
Revised pagination logic to be incremental based on replication value.
xacadil Apr 17, 2024
ee61735
Update streams.py
hsyyid Apr 18, 2024
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
23 changes: 12 additions & 11 deletions tap_restaurant365/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,15 @@ def get_next_page_token(
previous_token = previous_token['token']
return {"token":previous_token,"skip":self.skip}
else:
self.skip = 0
start_date = (parser.parse(self.tap_state["bookmarks"][self.name]['starting_replication_value']) + timedelta(seconds=1)) or parser.parse(self.config.get("start_date"))
self.skip = 0
#Pick starting value just incase progress marker is not present.
replication_key_value = self.tap_state["bookmarks"][self.name]['starting_replication_value']
if "progress_markers" in self.tap_state["bookmarks"][self.name]:
replication_key_value = self.tap_state["bookmarks"][self.name]['progress_markers']["replication_key_value"]

start_date = (parser.parse(replication_key_value) + timedelta(seconds=1)) or parser.parse(self.config.get("start_date"))
today = datetime.today()
if previous_token:
if "token" in previous_token:
previous_token = previous_token['token']
if previous_token:
#Look for records that are greater than the previous token
previous_token = previous_token + timedelta(seconds=1)
previous_token = previous_token or start_date
next_token = (previous_token + timedelta(days=self.days_delta)).replace(tzinfo=None)
next_token = start_date.replace(tzinfo=None)

if (today - next_token).days < self.days_delta:
self.paginate = False
Expand All @@ -64,7 +62,10 @@ def get_url_params(
start_date = token_date or self.get_starting_time(context)
end_date = start_date + timedelta(days = self.days_delta)
if self.replication_key:
params["$filter"] = f"{self.replication_key} ge {start_date.strftime('%Y-%m-%dT%H:%M:%SZ')} and {self.replication_key} lt {end_date.strftime('%Y-%m-%dT%H:%M:%SZ')}"
params["$filter"] = (
f"{self.replication_key} ge {start_date.strftime('%Y-%m-%dT%H:%M:%SZ')} and {self.replication_key} lt {end_date.strftime('%Y-%m-%dT23:59:59Z')}"
)
params['$orderby'] = f"{self.replication_key}"
if self.name == "journal_entries":
#set a date in the stream to check later to see if we need to keep calling to the stream
params["$filter"] += f" and type eq 'Journal Entry'"
Expand Down
Loading