nk, not fully tested
This commit is contained in:
@@ -7,7 +7,7 @@ from rowers.views.statements import *
|
||||
from rowers.plannedsessions import get_dates_timeperiod
|
||||
from rowers.tasks import fetch_strava_workout
|
||||
|
||||
from rowers.integrations import C2Integration, StravaIntegration
|
||||
from rowers.integrations import C2Integration, StravaIntegration, NKIntegration
|
||||
|
||||
import rowers.integrations.strava as strava
|
||||
|
||||
@@ -177,19 +177,9 @@ def rower_rojabo_authorize(request): # pragma: no cover
|
||||
# NK Logbook authorization
|
||||
@login_required()
|
||||
def rower_nk_authorize(request): # pragma: no cover
|
||||
state = str(uuid4())
|
||||
scope = "read"
|
||||
params = {
|
||||
"grant_type": "authorization_code",
|
||||
"response_type": "code",
|
||||
"client_id": NK_CLIENT_ID,
|
||||
"scope": scope,
|
||||
"state": state,
|
||||
"redirect_uri": NK_REDIRECT_URI,
|
||||
}
|
||||
|
||||
url = NK_OAUTH_LOCATION+"/oauth/authorize?"+urllib.parse.urlencode(params)
|
||||
|
||||
nk_integration = NKIntegration(request.user)
|
||||
url = nk_integration.make_authorization_url()
|
||||
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
|
||||
@@ -545,7 +535,8 @@ def rower_process_nkcallback(request): # pragma: no cover
|
||||
# do stuff
|
||||
try:
|
||||
code = request.GET.get('code', None)
|
||||
res = nkstuff.get_token(code)
|
||||
nk_integration = NKIntegration(request.user)
|
||||
access_token, expires_in, refresh_token = nk_integration.get_token(code)
|
||||
except MultiValueDictKeyError:
|
||||
message = "The resource owner or authorization server denied the request"
|
||||
messages.error(request, message)
|
||||
@@ -553,7 +544,6 @@ def rower_process_nkcallback(request): # pragma: no cover
|
||||
url = reverse('rower_exportsettings_view')
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
access_token = res[0]
|
||||
if access_token == 0:
|
||||
message = res[1]
|
||||
message += ' Contact support@rowsandall.com if this behavior persists'
|
||||
@@ -563,16 +553,14 @@ def rower_process_nkcallback(request): # pragma: no cover
|
||||
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
expires_in = res[1]
|
||||
refresh_token = res[2]
|
||||
nk_owner_id = res[3]
|
||||
# nk_owner_id = res[3]
|
||||
expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
|
||||
|
||||
r = getrower(request.user)
|
||||
r.nktoken = access_token
|
||||
r.nktokenexpirydate = expirydatetime
|
||||
r.nkrefreshtoken = refresh_token
|
||||
r.nk_owner_id = nk_owner_id
|
||||
# r.nk_owner_id = nk_owner_id
|
||||
|
||||
r.save()
|
||||
|
||||
@@ -594,16 +582,16 @@ def workout_getnkworkout_all(request, startdatestring='', enddatestring=''):
|
||||
|
||||
after = arrow.get(startdate)
|
||||
after = str(int(after.timestamp()*1000))
|
||||
nk_integration = NKIntegration(request.user)
|
||||
|
||||
try:
|
||||
_ = nk_open(request.user)
|
||||
_ = nk_integration.open()
|
||||
except NoTokenError: # pragma: no cover
|
||||
return HttpResponseRedirect("rower_nk_authorize")
|
||||
|
||||
r = getrequestrower(request)
|
||||
|
||||
result = nkstuff.get_nk_workouts(
|
||||
r, do_async=True, before=before, after=after)
|
||||
result = nk_integration.get_workouts(before=before, after=after)
|
||||
|
||||
if result:
|
||||
messages.info(
|
||||
@@ -624,125 +612,25 @@ def workout_nkimport_view(request, userid=0, after=0, before=0):
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
r = getrequestrower(request, userid=userid)
|
||||
#if r.user != request.user: # pragma: no cover
|
||||
# messages.error(
|
||||
# request, 'You can only access your own workouts on the NK Logbook, not those of your athletes')
|
||||
# url = reverse('workout_nkimport_view', kwargs={
|
||||
# 'userid': request.user.id})
|
||||
# return HttpResponseRedirect(url)
|
||||
nk_integration = NKIntegration(request.user)
|
||||
|
||||
try:
|
||||
_ = nk_open(r.user)
|
||||
_ = nk_integration.open()
|
||||
except NoTokenError: # pragma: no cover
|
||||
return HttpResponseRedirect("/rowers/me/nkauthorize/")
|
||||
|
||||
if request.method == 'POST': # pragma: no cover
|
||||
dateform = DateRangeForm(request.POST)
|
||||
if dateform.is_valid():
|
||||
startdate = dateform.cleaned_data['startdate']
|
||||
enddate = dateform.cleaned_data['enddate'] + \
|
||||
datetime.timedelta(days=1)
|
||||
else:
|
||||
dateform = DateRangeForm(initial={
|
||||
'startdate': startdate,
|
||||
'enddate': enddate,
|
||||
})
|
||||
|
||||
if enddate < startdate: # pragma: no cover
|
||||
s = enddate
|
||||
enddate = startdate
|
||||
startdate = s
|
||||
|
||||
startdatestring = startdate.strftime('%Y-%m-%d')
|
||||
enddatestring = enddate.strftime('%Y-%m-%d')
|
||||
workouts = nk_integration.get_workout_list(before=0, after=0)
|
||||
|
||||
request.session['startdate'] = startdatestring
|
||||
request.session['enddate'] = enddatestring
|
||||
|
||||
before = arrow.get(enddate)
|
||||
before = str(int(before.timestamp()*1000))
|
||||
|
||||
after = arrow.get(startdate)
|
||||
after = str(int(after.timestamp()*1000))
|
||||
|
||||
res = nkstuff.get_nk_workout_list(r.user, before=before, after=after)
|
||||
|
||||
if (res.status_code != 200): # pragma: no cover
|
||||
if (res.status_code == 401):
|
||||
r = getrower(request.user)
|
||||
if (r.nktoken == '') or (r.nktoken is None):
|
||||
s = "Token doesn't exist. Need to authorize"
|
||||
return HttpResponseRedirect("/rowers/me/nkauthorize/")
|
||||
message = "Something went wrong in workout_nkimport_view"
|
||||
messages.error(request, message)
|
||||
url = reverse('workouts_view')
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
# get NK IDs
|
||||
nkids = [item['id'] for item in res.json()]
|
||||
knownnkids = uniqify([
|
||||
w.uploadedtonk for w in Workout.objects.filter(user=r)
|
||||
])
|
||||
tombstones = [
|
||||
t.uploadedtonk for t in TombStone.objects.filter(user=r)
|
||||
]
|
||||
parkedids = []
|
||||
try:
|
||||
with open('nkblocked.json', 'r') as nkblocked:
|
||||
try:
|
||||
jsondata = json.load(nkblocked)
|
||||
except:
|
||||
jsondata = {
|
||||
'ids':[]
|
||||
}
|
||||
parkedids = jsondata['ids']
|
||||
except FileNotFoundError: # pragma: no cover
|
||||
pass
|
||||
|
||||
knownnkids = uniqify(knownnkids+tombstones+parkedids)
|
||||
workouts = []
|
||||
|
||||
for item in res.json():
|
||||
d = int(float(item['totalDistanceGps'])) # could also be Impeller
|
||||
i = item['id']
|
||||
n = item['name']
|
||||
if i in knownnkids:
|
||||
nnn = ''
|
||||
else: # pragma: no cover
|
||||
nnn = 'NEW'
|
||||
ttot = str(datetime.timedelta(
|
||||
seconds=int(float(item['elapsedTime'])/1000.)))
|
||||
s = arrow.get(item['startTime'], tzinfo=r.defaulttimezone).format(
|
||||
arrow.FORMAT_RFC850)
|
||||
keys = ['id', 'distance', 'duration', 'starttime', 'name', 'new']
|
||||
values = [i, d, ttot, s, n, nnn]
|
||||
rs = dict(zip(keys, values))
|
||||
workouts.append(rs)
|
||||
|
||||
workouts = workouts[::-1]
|
||||
|
||||
if request.method == 'POST': # pragma: no cover
|
||||
try:
|
||||
tdict = dict(request.POST.lists())
|
||||
ids = tdict['workoutid']
|
||||
nkids = [int(id) for id in ids]
|
||||
alldata = {}
|
||||
|
||||
for item in res.json():
|
||||
alldata[item['id']] = item
|
||||
counter = 0
|
||||
for nkid in nkids:
|
||||
_ = myqueue(
|
||||
queue,
|
||||
handle_nk_async_workout,
|
||||
alldata,
|
||||
r.user.id,
|
||||
r.nktoken,
|
||||
nkid,
|
||||
counter,
|
||||
r.defaulttimezone
|
||||
)
|
||||
counter = counter+1
|
||||
_ = nk_integration.get_workout(nkid)
|
||||
messages.info(
|
||||
request,
|
||||
'Your NK logbook workouts will be imported in the background.'
|
||||
@@ -765,17 +653,17 @@ def workout_nkimport_view(request, userid=0, after=0, before=0):
|
||||
|
||||
checknew = request.GET.get('selectallnew', False)
|
||||
|
||||
return render(request, 'nk_list_import.html',
|
||||
return render(request, 'list_import.html',
|
||||
{
|
||||
'workouts': workouts,
|
||||
'rower': r,
|
||||
'dateform': dateform,
|
||||
'startdate': startdate,
|
||||
'enddate': enddate,
|
||||
'active': 'nav-workouts',
|
||||
'breadcrumbs': breadcrumbs,
|
||||
'teams': get_my_teams(request.user),
|
||||
'checknew': checknew,
|
||||
'integration': 'NK Logbook'
|
||||
})
|
||||
|
||||
# Process Strava Callback
|
||||
@@ -1744,7 +1632,7 @@ importsources = {
|
||||
'ownapi': ownapistuff,
|
||||
'sporttracks': sporttracksstuff,
|
||||
'trainingpeaks': tpstuff,
|
||||
'nk': nkstuff,
|
||||
'nk': NKIntegration,
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user