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

fix date chunking for bulk rest-api syncs #60

Merged
merged 2 commits into from
Dec 12, 2018
Merged

fix date chunking for bulk rest-api syncs #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a70020
fix date chunking for bulk rest-api syncs
Dec 12, 2018
61cc0f0
refactor for pylint
Dec 12, 2018
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
45 changes: 31 additions & 14 deletions tap_salesforce/salesforce/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ def _query_recur(
url = "{}/services/data/v41.0/queryAll".format(self.sf.instance_url)
headers = self.sf._get_standard_headers()

sync_start = singer_utils.now()
if end_date is None:
end_date = singer_utils.now()
end_date = sync_start

if retries == 0:
raise TapSalesforceException(
Expand All @@ -41,19 +42,20 @@ def _query_recur(

retryable = False
try:
while True:
resp = self.sf._make_request('GET', url, headers=headers, params=params)
resp_json = resp.json()

for rec in resp_json.get('records'):
yield rec

next_records_url = resp_json.get('nextRecordsUrl')

if next_records_url is None:
break
else:
url = "{}{}".format(self.sf.instance_url, next_records_url)
for rec in self._sync_records(url, headers, params):
yield rec

# If the date range was chunked (an end_date was passed), sync
# from the end_date -> now
if end_date < sync_start:
next_start_date_str = singer_utils.strftime(end_date)
query = self.sf._build_query_string(catalog_entry, next_start_date_str)
for record in self._query_recur(
query,
catalog_entry,
next_start_date_str,
retries=retries):
yield record

except HTTPError as ex:
response = ex.response.json()
Expand Down Expand Up @@ -86,3 +88,18 @@ def _query_recur(
end_date,
retries - 1):
yield record

def _sync_records(self, url, headers, params):
while True:
resp = self.sf._make_request('GET', url, headers=headers, params=params)
resp_json = resp.json()

for rec in resp_json.get('records'):
yield rec

next_records_url = resp_json.get('nextRecordsUrl')

if next_records_url is None:
break
else:
url = "{}{}".format(self.sf.instance_url, next_records_url)