sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/basicpro

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-31 13:29:36 +01:00
parent 58f66fbd11 d2d0fd312f
commit 0be47db924
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/integrations/intervals.py
View File

@@ -377,6 +377,7 @@ class IntervalsIntegration(SyncIntegration):
if not force_download and id in known_interval_ids: if not force_download and id in known_interval_ids:
return self.update_workout(id) return self.update_workout(id)
record = create_or_update_syncrecord(r, None, intervalsid=id) record = create_or_update_syncrecord(r, None, intervalsid=id)
if do_async: if do_async:
@@ -728,7 +729,12 @@ class IntervalsIntegration(SyncIntegration):
try: try:
id = record['id'] id = record['id']
result = self.get_workout(id, do_async=False) external_id = record['external_id']
try:
w = Workout.objects.get(id=encoder.decode_hex(external_id))
result = self.update_workout(id)
except Workout.DoesNotExist:
result = self.get_workout(id, do_async=False)
except KeyError: except KeyError:
pass pass

2
rowers/views/importviews.py
View File

@@ -929,7 +929,7 @@ def intervals_webhook_view(request):
dologging("intervals_webhooks.log",request.body) dologging("intervals_webhooks.log",request.body)
else: else:
dologging("intervals_webhooks.log","request.body") dologging("intervals_webhooks.log",request.body)
data = json.loads(request.body) data = json.loads(request.body)
try: try:
verificationtoken = data['secret'] verificationtoken = data['secret']