From 358782fc0feb55fb31fa0bd503696275b499fe5d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 8 May 2017 18:10:18 +0200
Subject: [PATCH] trainingpeaks to production

---
 rowers/models.py             | 1 -
 rowers/runkeeperstuff.py     | 1 -
 rowers/templates/export.html | 2 +-
 rowers/tpstuff.py            | 8 ++++----
 rowers/views.py              | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 9102a17a..241df8fb 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -406,7 +406,6 @@ class Workout(models.Model):
     uploadedtounderarmour = models.IntegerField(default=0)
     uploadedtotp = models.IntegerField(default=0)
     uploadedtorunkeeper = models.IntegerField(default=0)
-    runkeeperuri = models.CharField(default='',max_length=200)
     
     # empower stuff
     inboard = models.FloatField(default=0.88)
diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py
index dc2b3969..bcc0edee 100644
--- a/rowers/runkeeperstuff.py
+++ b/rowers/runkeeperstuff.py
@@ -356,7 +356,6 @@ def workout_runkeeper_upload(user,w):
 	    rkid = getidfromresponse(response)
             rkuri = geturifromid(thetoken,rkid)
 	    w.uploadedtorunkeeper = rkid
-            w.runkeeperuri = rkuri
 	    w.save()
             return '',rkid
 	else:
diff --git a/rowers/templates/export.html b/rowers/templates/export.html
index 006f9f1b..52f53480 100644
--- a/rowers/templates/export.html
+++ b/rowers/templates/export.html
@@ -142,7 +142,7 @@
   {% endif %}
   {% else %}
     <div class="grid_1">
-      <a href="https://app.sandbox.trainingpeaks.com">
+      <a href="https://app.trainingpeaks.com">
       <img src="/static/img/tpchecked.png" alt="TrainingPeaks icon" width="60" height="60"></a>
   </div>
   {% endif %}
diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py
index 3dfad6a9..ccd33293 100644
--- a/rowers/tpstuff.py
+++ b/rowers/tpstuff.py
@@ -40,7 +40,7 @@ from rowsandall_app.settings import (
     TP_REDIRECT_URI,TP_CLIENT_KEY,
     )
 
-tpapilocation = "https://api.sandbox.trainingpeaks.com"
+tpapilocation = "https://api.trainingpeaks.com"
 
 # Custom error class - to raise a NoTokenError
 class TPNoTokenError(Exception):
@@ -107,7 +107,7 @@ def do_refresh_token(refreshtoken):
     }
     
 
-    url = "https://oauth.sandbox.trainingpeaks.com/oauth/token"
+    url = "https://oauth.trainingpeaks.com/oauth/token"
     
     response = requests.post(url,
                              data=post_data,
@@ -141,7 +141,7 @@ def get_token(code):
 	'Content-Type': 'application/x-www-form-urlencoded',
     }
     
-    response = requests.post("https://oauth.sandbox.trainingpeaks.com/oauth/token",
+    response = requests.post("https://oauth.trainingpeaks.com/oauth/token",
                              data=post_data)
 
 
@@ -167,7 +167,7 @@ def make_authorization_url(request):
               "redirect_uri": TP_REDIRECT_URI,
               "scope": "file:write",
 	      }
-    url = "https://oauth.sandbox.trainingpeaks.com/oauth/authorize?" +urllib.urlencode(params)
+    url = "https://oauth.trainingpeaks.com/oauth/authorize?" +urllib.urlencode(params)
 
     return HttpResponseRedirect(url)
 
diff --git a/rowers/views.py b/rowers/views.py
index c12c58ac..46ec2d4e 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1654,7 +1654,7 @@ def rower_tp_authorize(request):
               "redirect_uri": TP_REDIRECT_URI,
               "scope": "file:write",
 	      }
-    url = "https://oauth.sandbox.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params)
+    url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params)
 
     return HttpResponseRedirect(url)
 
@@ -5508,7 +5508,6 @@ def workout_getrunkeeperworkout_view(request,runkeeperid):
     w = Workout.objects.get(id=id)
     w.uploadedtorunkeeper=runkeeperid
     thetoken = runkeeper_open(request.user)
-    w.runkeeperuri = runkeeperstuff.geturifromid(thetoken,runkeeperid)
     w.save()
     if message:
         url = reverse(workout_edit_view,