From 2deb4fcbe303a420f91dee03c2b63cb6f7cdd2d5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 18 Apr 2021 12:38:22 +0200 Subject: [PATCH] fix tests --- rowers/nkstuff.py | 3 ++- rowers/tests/mocks.py | 3 ++- rowers/views/importviews.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index 1fb9c5f8..82a5f48d 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -272,7 +272,6 @@ def get_workout(user,nkid): response = requests.get(url,headers=headers,params=params) - if response.status_code != 200: # error handling and logging return {},pd.DataFrame() @@ -293,6 +292,7 @@ def get_workout(user,nkid): before = before+timedelta(days=1) before = str(int(before.timestamp())*1000) after = str(int(after.timestamp())*1000) + print(after) url = NK_API_LOCATION+"api/v1/sessions/" @@ -309,6 +309,7 @@ def get_workout(user,nkid): jsondata = response.json() workoutdata = {} + for w in jsondata: if str(w['id']) == str(nkid): workoutdata = w diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py index 563c5477..845690a9 100644 --- a/rowers/tests/mocks.py +++ b/rowers/tests/mocks.py @@ -1047,7 +1047,8 @@ def mocked_requests(*args, **kwargs): return MockResponse(nkstrokedata,200) if nkworkoutlisttester.match(args[0]): params = kwargs.pop('params',{}) - if 'after' in params and params['after'] == 1267136372998: + + if 'after' in params and params['after'] == '1267049972000': return MockResponse(nkimpellerworkoutlist,200) return MockResponse(nkworkoutlist,200) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 69a036a8..fc19b013 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -2003,6 +2003,7 @@ def workout_getrp3importview(request,externalid): @login_required() def workout_getimportview(request,externalid,source = 'c2'): data,strokedata = importsources[source].get_workout(request.user,externalid) + if not data: messages.error(request,"No strokedata received") url = reverse('workouts_view')