sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix tests

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-18 12:38:22 +02:00
parent b6b9f29a70
commit 2deb4fcbe3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/nkstuff.py
View File

@@ -272,7 +272,6 @@ def get_workout(user,nkid):
response = requests.get(url,headers=headers,params=params) response = requests.get(url,headers=headers,params=params)
if response.status_code != 200: if response.status_code != 200:
# error handling and logging # error handling and logging
return {},pd.DataFrame() return {},pd.DataFrame()
@@ -293,6 +292,7 @@ def get_workout(user,nkid):
before = before+timedelta(days=1) before = before+timedelta(days=1)
before = str(int(before.timestamp())*1000) before = str(int(before.timestamp())*1000)
after = str(int(after.timestamp())*1000) after = str(int(after.timestamp())*1000)
print(after)
url = NK_API_LOCATION+"api/v1/sessions/" url = NK_API_LOCATION+"api/v1/sessions/"
@@ -309,6 +309,7 @@ def get_workout(user,nkid):
jsondata = response.json() jsondata = response.json()
workoutdata = {} workoutdata = {}
for w in jsondata: for w in jsondata:
if str(w['id']) == str(nkid): if str(w['id']) == str(nkid):
workoutdata = w workoutdata = w

3
rowers/tests/mocks.py
View File

@@ -1047,7 +1047,8 @@ def mocked_requests(*args, **kwargs):
return MockResponse(nkstrokedata,200) return MockResponse(nkstrokedata,200)
if nkworkoutlisttester.match(args[0]): if nkworkoutlisttester.match(args[0]):
params = kwargs.pop('params',{}) 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(nkimpellerworkoutlist,200)
return MockResponse(nkworkoutlist,200) return MockResponse(nkworkoutlist,200)

1
rowers/views/importviews.py
View File

@@ -2003,6 +2003,7 @@ def workout_getrp3importview(request,externalid):
@login_required() @login_required()
def workout_getimportview(request,externalid,source = 'c2'): def workout_getimportview(request,externalid,source = 'c2'):
data,strokedata = importsources[source].get_workout(request.user,externalid) data,strokedata = importsources[source].get_workout(request.user,externalid)
if not data: if not data:
messages.error(request,"No strokedata received") messages.error(request,"No strokedata received")
url = reverse('workouts_view') url = reverse('workouts_view')