From 5130c14c395506d49dff6b5f66ed8cfd32c8dec7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 12:49:00 +0100 Subject: [PATCH 1/2] fixing intervals_webhooks logging --- rowers/.#urls.py | 1 - rowers/views/importviews.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 rowers/.#urls.py diff --git a/rowers/.#urls.py b/rowers/.#urls.py deleted file mode 120000 index 5317f650..00000000 --- a/rowers/.#urls.py +++ /dev/null @@ -1 +0,0 @@ -sander@rowsandall-2.17364:1733469196 \ No newline at end of file diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 6a824771..815e4615 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -931,7 +931,7 @@ def intervals_webhook_view(request): dologging("intervals_webhooks.log",request.body) else: - dologging("intervals_webhooks.log","request.body") + dologging("intervals_webhooks.log",request.body) data = json.loads(request.body) try: verificationtoken = data['secret'] From 645d774e471f0d7522c9ca39008369c6577e4143 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Dec 2024 13:18:34 +0100 Subject: [PATCH 2/2] intervals.icu duplicates detection improved --- rowers/integrations/intervals.py | 8 +++++++- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py index 92a3beb1..97eb554f 100644 --- a/rowers/integrations/intervals.py +++ b/rowers/integrations/intervals.py @@ -377,6 +377,7 @@ class IntervalsIntegration(SyncIntegration): if not force_download and id in known_interval_ids: return self.update_workout(id) + record = create_or_update_syncrecord(r, None, intervalsid=id) if do_async: @@ -728,7 +729,12 @@ class IntervalsIntegration(SyncIntegration): try: 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: pass diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 98b3260df55b52068c90763be40ff1f89ad1b594..2d0c750c3544fdff57ab5c35c1e91a104bb99c98 100644 GIT binary patch delta 16 XcmbO#KUJPxzMF$1`Cjox_C9_9DzybO delta 16 XcmbO#KUJPxzMF$1V@1(M_C9_9DUSsK