Private
Public Access
1
0

last pep in rowers dir

This commit is contained in:
Sander Roosendaal
2022-03-14 19:59:48 +01:00
parent a0223bec24
commit ded96b4ccd
3 changed files with 28 additions and 63 deletions

View File

@@ -6,8 +6,6 @@ from rowers.tasks import handle_rp3_async_workout
from rowsandall_app.settings import (
C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI, STRAVA_CLIENT_SECRET,
RP3_CLIENT_ID, RP3_CLIENT_SECRET,
RP3_REDIRECT_URI, RP3_CLIENT_KEY,
RP3_CLIENT_ID, RP3_CLIENT_KEY, RP3_REDIRECT_URI, RP3_CLIENT_SECRET,
UPLOAD_SERVICE_URL, UPLOAD_SERVICE_SECRET
)
@@ -29,8 +27,6 @@ queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('high')
#from async_messages import message_user,messages
oauth_data = {
'client_id': RP3_CLIENT_ID,
'client_secret': RP3_CLIENT_SECRET,
@@ -64,8 +60,6 @@ def do_refresh_token(refreshtoken): # pragma: no cover
def get_token(code): # pragma: no cover
client_auth = requests.auth.HTTPBasicAuth(
RP3_CLIENT_KEY, RP3_CLIENT_SECRET)
post_data = {
"client_id": RP3_CLIENT_KEY,
"grant_type": "authorization_code",
@@ -73,9 +67,6 @@ def get_token(code): # pragma: no cover
"redirect_uri": RP3_REDIRECT_URI,
"client_secret": RP3_CLIENT_SECRET,
}
headers = {
'Content-Type': 'application/x-www-form-urlencoded',
}
response = requests.post(
"https://rp3rowing-app.com/oauth/token",
@@ -102,8 +93,6 @@ def make_authorization_url(request): # pragma: no cover
def get_rp3_workout_list(user):
r = Rower.objects.get(user=user)
auth_token = rp3_open(user)
headers = {'Authorization': 'Bearer ' + auth_token}
@@ -148,13 +137,13 @@ def get_rp3_workouts(rower, do_async=True): # pragma: no cover
w.uploadedtorp3 for w in Workout.objects.filter(user=rower)
])
newids = [rp3id for rp3id in rp3ids if not rp3id in knownrp3ids]
newids = [rp3id for rp3id in rp3ids if rp3id not in knownrp3ids]
for id in newids:
startdatetime = workouts_list.loc[id, 'executed_at']
dologging('rp3_import.log', startdatetime)
job = myqueue(
_ = myqueue(
queuehigh,
handle_rp3_async_workout,
rower.user.id,
@@ -221,7 +210,6 @@ def get_rp3_workout_token(workout_id, auth_token, waittime=3, max_attempts=20):
def get_rp3_workout_link(user, workout_id, waittime=3, max_attempts=20): # pragma: no cover
r = Rower.objects.get(user=user)
auth_token = rp3_open(user)
return get_rp3_workout_token(workout_id, auth_token, waittime=waittime, max_attempts=max_attempts)
@@ -231,7 +219,6 @@ def get_rp3_workout(user, workout_id, startdatetime=None): # pragma: no cover
url = get_rp3_workout_link(user, workout_id)
filename = 'media/RP3Import_'+str(workout_id)+'.csv'
r = Rower.objects.get(user=user)
auth_token = rp3_open(user)
if not startdatetime: