diff --git a/rowers/middleware.py b/rowers/middleware.py index 4cdc20bd..a4e9249a 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -5,6 +5,7 @@ import datetime from rowers.utils import myqueue import django_rq queue = django_rq.get_queue('default') +queuelow = django_rq.get_queue('low') from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired from rowers.mytypes import otwtypes from django.contrib import messages @@ -59,7 +60,7 @@ def do_update(user,mode='rower',days=42): if last_update_date < now_date and max_workout_id < max_id: - job = myqueue(queue, + job = myqueue(queuelow, handle_updatefitnessmetric, user.id,mode,theids, ) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 4718c5e7..f31f6ca1 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 32925353..135b53d1 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -407,7 +407,7 @@ def rower_c2_authorize(request): params = {"client_id": C2_CLIENT_ID, "response_type": "code", "redirect_uri": C2_REDIRECT_URI} - url = "http://log.concept2.com/oauth/authorize?"+ urllib.urlencode(params) + url = "http://log.concept2.com/oauth/authorize?"+ urllib.parse.urlencode(params) url += "&scope="+scope return HttpResponseRedirect(url) @@ -424,7 +424,7 @@ def rower_strava_authorize(request): "redirect_uri": STRAVA_REDIRECT_URI, "scope": "activity:write,activity:read_all"} - url = "https://www.strava.com/oauth/authorize?"+ urllib.urlencode(params) + url = "https://www.strava.com/oauth/authorize?"+ urllib.parse.urlencode(params) return HttpResponseRedirect(url) @@ -440,7 +440,7 @@ def rower_polar_authorize(request): "state": state, # "scope":"accesslink.read_all" } - url = "https://flow.polar.com/oauth2/authorization?" +urllib.urlencode(params) + url = "https://flow.polar.com/oauth2/authorization?" +urllib.parse.urlencode(params) return HttpResponseRedirect(url) @@ -459,7 +459,7 @@ def rower_runkeeper_authorize(request): "state": state, "redirect_uri": RUNKEEPER_REDIRECT_URI} - url = "https://runkeeper.com/apps/authorize?"+ urllib.urlencode(params) + url = "https://runkeeper.com/apps/authorize?"+ urllib.parse.urlencode(params) return HttpResponseRedirect(url) @@ -477,7 +477,7 @@ def rower_sporttracks_authorize(request): "state": state, "redirect_uri": SPORTTRACKS_REDIRECT_URI} - url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.urlencode(params) + url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.parse.urlencode(params) return HttpResponseRedirect(url) @@ -511,7 +511,7 @@ def rower_tp_authorize(request): "redirect_uri": TP_REDIRECT_URI, "scope": "file:write", } - url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params) + url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.parse.urlencode(params) return HttpResponseRedirect(url)