From 4b192addf280232efe2f4c9c37d3e332640029ab Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 16 Jul 2020 22:07:45 +0200
Subject: [PATCH] adding garmin id

---
 rowers/tasks.py              | 6 +++++-
 rowers/uploads.py            | 9 +++++++++
 rowers/views/workoutviews.py | 5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index 6fc69f27..26b240b5 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -697,6 +697,9 @@ def handle_get_garmin_file(client_id,
                            **kwargs):
 
 
+    regex = '.*\?id=(\d+)'
+    m = re.compile(regex).match(url).group(1)
+    garminid = int(m)
 
     garmin = OAuth1Session(client_id,
                           client_secret=client_secret,
@@ -724,6 +727,7 @@ def handle_get_garmin_file(client_id,
         'title': '',
         'workouttype':'water',
         'boattype':'1x',
+        'garminid': garminid,
     }
     session = requests.session()
     newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'}
@@ -2969,7 +2973,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
         f.write('\n')
         f.write(timestamp)
         f.write(' ')
-        f.write('handle_get_garmin_file posted file with strava id {stravaid} user id {userid}\n'.format(
+        f.write('fetch_strava_workout posted file with strava id {stravaid} user id {userid}\n'.format(
             stravaid=stravaid,userid=userid))
 
 
diff --git a/rowers/uploads.py b/rowers/uploads.py
index 185493ff..f6a95655 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -534,6 +534,15 @@ def do_sync(w,options, quick=False):
     except KeyError:
         pass
 
+    try:
+        if options['garmind'] != 0 and options['garminid'] != '':
+            w.uploadedtogarmin = options['garminid']
+            w.save()
+    except KeyError:
+        pass
+
+
+
 
     if ('upload_to_C2' in options and options['upload_to_C2']) or (w.user.c2_auto_export):
         try:
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 44ed35f7..ca151864 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4666,6 +4666,11 @@ def workout_upload_api(request):
     except KeyError:
         stravaid = ''
 
+    try:
+        garminid = post_data['garminid']
+    except KeyError:
+        garminid = 0
+
     if form.is_valid():
         t = form.cleaned_data['title']
         boattype = form.cleaned_data['boattype']