nk api update
This commit is contained in:
@@ -210,7 +210,7 @@ def rower_nk_token_refresh(user):
|
||||
def make_authorization_url(request):
|
||||
return imports_make_authorization_url(oauth_data)
|
||||
|
||||
def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
|
||||
def get_nk_workout_list(user,fake=False,after=0,before=0):
|
||||
r = Rower.objects.get(user=user)
|
||||
|
||||
if (r.nktoken == '') or (r.nktoken is None):
|
||||
@@ -221,12 +221,12 @@ def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
|
||||
return custom_exception_handler(401,s)
|
||||
else:
|
||||
# ready to fetch. Hurray
|
||||
if not endTime:
|
||||
endTime = arrow.now()+timedelta(days=1)
|
||||
endTime = str(int(endTime.timestamp())*1000)
|
||||
if not startTime:
|
||||
startTime = arrow.now()-timedelta(days=30)
|
||||
startTime = str(int(startTime.timestamp())*1000)
|
||||
if not before:
|
||||
before = arrow.now()+timedelta(days=1)
|
||||
before = str(int(before.timestamp())*1000)
|
||||
if not after:
|
||||
after = arrow.now()-timedelta(days=30)
|
||||
after = str(int(after.timestamp())*1000)
|
||||
authorizationstring = str('Bearer ' + r.nktoken)
|
||||
headers = {'Authorization': authorizationstring,
|
||||
'user-agent': 'sanderroosendaal',
|
||||
@@ -236,8 +236,8 @@ def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
|
||||
url = NK_API_LOCATION+"api/v1/sessions"
|
||||
|
||||
params = {
|
||||
'startTime':startTime,
|
||||
'endTime':endTime,
|
||||
'after':after,
|
||||
'before':before,
|
||||
} # start / end time
|
||||
|
||||
s = requests.get(url,headers=headers,params=params)
|
||||
@@ -260,6 +260,7 @@ def get_workout(user,nkid):
|
||||
'sessionIds': nkid,
|
||||
}
|
||||
|
||||
|
||||
authorizationstring = str('Bearer ' + r.nktoken)
|
||||
headers = {'Authorization': authorizationstring,
|
||||
'user-agent': 'sanderroosendaal',
|
||||
@@ -270,7 +271,6 @@ def get_workout(user,nkid):
|
||||
url = NK_API_LOCATION+"api/v1/sessions/strokes"
|
||||
response = requests.get(url,headers=headers,params=params)
|
||||
|
||||
|
||||
if response.status_code != 200:
|
||||
# error handling and logging
|
||||
return {},pd.DataFrame()
|
||||
@@ -287,8 +287,8 @@ def get_workout(user,nkid):
|
||||
|
||||
url = NK_API_LOCATION+"api/v1/sessions/"
|
||||
params = {
|
||||
'startTime':timestampbegin-1,
|
||||
'endTime': timestampend+1,
|
||||
'after':timestampbegin-1,
|
||||
'before': timestampend+1,
|
||||
}
|
||||
|
||||
response = requests.get(url, headers=headers,params=params)
|
||||
@@ -303,4 +303,5 @@ def get_workout(user,nkid):
|
||||
if str(w['id']) == str(nkid):
|
||||
workoutdata = w
|
||||
|
||||
|
||||
return workoutdata, df
|
||||
|
||||
Reference in New Issue
Block a user