From c6ea8fb27cdd4b272581a3a9c13c5b02c0e65c44 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 29 Mar 2021 21:32:05 +0200 Subject: [PATCH 01/18] settings know about NK --- rowsandall_app/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index a358260d..7fd1c457 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -329,6 +329,9 @@ RP3_REDIRECT_URI = CFG["rp3_redict_uri"] RP3_CLIENT_KEY = RP3_CLIENT_ID # Nielsen-Kellerman +NK_ClIENT_ID = CFG["nk_client_id"] +NK_CLIENT_SECRET = CFG["nk_client_secret"] +NK_REDIRECT_URI = CFG["nk_redirect_uri"] # Full Site URL SITE_URL = CFG['site_url'] From 68edfe5a9489b4e00c2af739d8f5227816f76380 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 29 Mar 2021 21:55:29 +0200 Subject: [PATCH 02/18] nkauthorize redirect works, callback not --- rowers/models.py | 5 +++++ rowers/templates/rower_exportsettings.html | 1 + rowers/urls.py | 1 + rowers/views/importviews.py | 19 +++++++++++++++++++ rowers/views/statements.py | 3 ++- static/img/NKLiNK.jpg | Bin 0 -> 15499 bytes static/img/NK_white.png | Bin 0 -> 15555 bytes 7 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 static/img/NKLiNK.jpg create mode 100644 static/img/NK_white.png diff --git a/rowers/models.py b/rowers/models.py index e0222fd7..c93db7fb 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -997,6 +997,11 @@ class Rower(models.Model): rp3_auto_import = models.BooleanField(default=False) + nktoken = models.TextField(default='',max_length=1000,blank=True,null=True) + nktokenexpirydate = models.DateTimeField(blank=True,null=True) + nkrefreshtoken = models.TextField(default='',max_length=1000, + blank=True,null=True) + trainingpeaks_auto_export = models.BooleanField(default=False) polartoken = models.CharField(default='',max_length=1000,blank=True,null=True) diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html index 81179cb4..06b3a874 100644 --- a/rowers/templates/rower_exportsettings.html +++ b/rowers/templates/rower_exportsettings.html @@ -71,6 +71,7 @@ choice or to renew the authorization.

connect with strava

connect with Concept2

+

connect with NK LiNK

connect with SportTracks

connect with RunKeeper

connect with Under Armour

diff --git a/rowers/urls.py b/rowers/urls.py index 99959d6c..e6d1fc04 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -671,6 +671,7 @@ urlpatterns = [ re_path(r'^me/preferences/user/(?P\d+)/$',views.rower_prefs_view,name='rower_prefs_view'), re_path(r'^me/edit/(.+.*)/$',views.rower_edit_view,name='rower_edit_view'), re_path(r'^me/c2authorize/$',views.rower_c2_authorize,name='rower_c2_authorize'), + re_path(r'^me/nkauthorize/$',views.rower_nk_authorize,name='rower_nk_authorize'), re_path(r'^me/polarauthorize/$',views.rower_polar_authorize,name='rower_polar_authorize'), re_path(r'^me/revokeapp/(?P\d+)/$',views.rower_revokeapp_view,name='rower_revokeapp_view'), re_path(r'^me/stravaauthorize/$',views.rower_strava_authorize,name='rower_strava_authorize'), diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 4dfc0ab4..e5bdbaba 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -392,6 +392,25 @@ def workout_sporttracks_upload_view(request,id=0): return HttpResponseRedirect(url) + +# NK LiNK authorization +@login_required() +def rower_nk_authorize(request): + 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 = "https://oauth-stage.nkrowlink.com/oauth/authorize?"+urllib.parse.urlencode(params) + + return HttpResponseRedirect(url) + # Concept2 authorization @login_required() def rower_c2_authorize(request): diff --git a/rowers/views/statements.py b/rowers/views/statements.py index e2dd74d9..88b7f36b 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -185,7 +185,8 @@ from rowsandall_app.settings import ( RP3_CLIENT_ID,RP3_REDIRECT_URI,RP3_CLIENT_KEY,RP3_CLIENT_SECRET, BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY, PAYMENT_PROCESSING_ON, - RECAPTCHA_SITE_KEY, RECAPTCHA_SITE_SECRET + RECAPTCHA_SITE_KEY, RECAPTCHA_SITE_SECRET, + NK_REDIRECT_URI, NK_ClIENT_ID, NK_CLIENT_SECRET ) #from rowers.tasks_standalone import addcomment2 diff --git a/static/img/NKLiNK.jpg b/static/img/NKLiNK.jpg new file mode 100644 index 0000000000000000000000000000000000000000..38b9326b6572215be36aeb2f024b9bc092167099 GIT binary patch literal 15499 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 c@fVi<@BW8S|GrE0|E`t^!*0m8H$EdT%j literal 0 HcmV?d00001 diff --git a/static/img/NK_white.png b/static/img/NK_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0c35d7d9156b3336d93adf7ee1202dbef1bff3e3 GIT binary patch literal 15555 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 literal 0 HcmV?d00001 From 0cd8fabc13f5c30f176eb1fb05750e7c5eee7526 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 30 Mar 2021 09:05:26 +0200 Subject: [PATCH 03/18] passing tests with mock server for nk workouts list --- rowers/nkstuff.py | 107 ++++++++++++++++++++++++ rowers/stravastuff.py | 2 - rowers/templates/nk_list_import.html | 58 +++++++++++++ rowers/tests/mocks.py | 21 +++++ rowers/tests/test_imports.py | 64 ++++++++++++++ rowers/tests/testdata/nkworkoutlist.txt | 84 +++++++++++++++++++ rowers/tests/testdata/nkworkouts.txt | 84 +++++++++++++++++++ rowers/urls.py | 1 + rowers/views/importviews.py | 102 +++++++++++++++++++++- rowers/views/statements.py | 4 +- rowsandall_app/settings.py | 3 +- 11 files changed, 523 insertions(+), 7 deletions(-) create mode 100644 rowers/nkstuff.py create mode 100644 rowers/templates/nk_list_import.html create mode 100644 rowers/tests/testdata/nkworkoutlist.txt create mode 100644 rowers/tests/testdata/nkworkouts.txt diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py new file mode 100644 index 00000000..f5dbfb61 --- /dev/null +++ b/rowers/nkstuff.py @@ -0,0 +1,107 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import unicode_literals, absolute_import + +import time +from time import strftime + +import requests + +#https://oauth-stage.nkrowlink.com/oauth/authorizegrant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=fc8fc3d8-ce0a-443e-838a-1c06fb5317c6&redirect_uri=https%3A%2F%2Fdunav.ngrok.io%2Fnk_callback%2F +#https://oauth-stage.nkrowlink.com/oauth/authorize?grant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=1234&redirect_uri=https%3A%2F%2Fdev.rowsandall.com%2Fnk_callback + +import django_rq +queue = django_rq.get_queue('default') +queuelow = django_rq.get_queue('low') +queuehigh = django_rq.get_queue('low') + +from rowers.rower_rules import is_workout_user, ispromember + +from iso8601 import ParseError +from rowers.utils import myqueue + +import rowers.mytypes as mytypes +import gzip + +from rowsandall_app.settings import ( + NK_CLIENT_ID, NK_REDIRECT_URI, NK_CLIENT_SECRET, + SITE_URL, NK_API_LOCATION + ) + +try: + from json.decoder import JSONDecodeError +except ImportError: + JSONDecodeError = ValueError + +from rowers.imports import * + +oauth_data = { + 'client_id': NK_CLIENT_ID, + 'client_secret': NK_CLIENT_SECRET, + 'redirect_uri': NK_REDIRECT_URI, + 'autorization_uri': "https://oauth-stage.nkrowlink.com/oauth/authorize", + 'content_type': 'application/json', + 'tokenname': 'nktoken', + 'refreshtokenname': 'nkrefreshtoken', + 'expirydatename': 'nktokenexpirydate', + 'bearer_auth': True, + 'base_url': "https://oauth-stage.nkrowlink.com/oauth/token", + 'grant_type': 'refresh_token', + 'scope':'read', + } + +def get_token(code): + return imports_get_token(code, oauth_data) + +def nk_open(user): + t = time.localtime() + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + token = imports_open(user,oauth_data) + return token + +def do_refresh_token(refreshtoken): + return imports_do_refresh_token(refreshtoken, oauth_data) + +def rower_nk_token_refresh(user): + r = Rower.objects.get(user=user) + res = do_refresh_token(r.nkrefreshtoken) + access_token = res[0] + expires_in = res[1] + refresh_token = res[2] + expirydatetime = timezone.now()+timedelta(seconds=expires_in) + + r.nktoken = access_token + r.nktokenexpirydate = expirydatetime + r.nkrefreshtoken = refresh_token + r.save() + + return r.nktoken + +def make_authorization_url(request): + return imports_make_authorization_url(oauth_data) + +def get_nk_workout_list(user,fake=False): + r = Rower.objects.get(user=user) + + if (r.nktoken == '') or (r.nktoken is None): + s = "Token doesn't exist. Need to authorize" + return custom_exception_handler(401,s) + elif (r.nktokenexpirydate is None or timezone.now()+timedelta(seconds=3599)>r.nktokenexpirydate): + s = "Token expired. Needs to refresh." + return custom_exception_handler(401,s) + else: + # ready to fetch. Hurray + authorizationstring = str('Bearer ' + r.nktoken) + headers = {'Authorization': authorizationstring, + 'user-agent': 'sanderroosendaal', + 'Content-Type': 'application/json'} + + url = NK_API_LOCATION+"api/v1/sessions" + + params = {} # start / end time + + s = requests.get(url,headers=headers,params=params) + + return s diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 2cef3373..d0914b77 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -131,8 +131,6 @@ def strava_establish_push(): response = requests.post(url,data=post_data) - print(response.json()) - return response.status_code def strava_list_push(): diff --git a/rowers/templates/nk_list_import.html b/rowers/templates/nk_list_import.html new file mode 100644 index 00000000..44ae0554 --- /dev/null +++ b/rowers/templates/nk_list_import.html @@ -0,0 +1,58 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block title %}Workouts{% endblock %} + +{% block main %} +

Available on nk

+{% if workouts %} +
    +
  • + Import all NEW +
    • +
  • +

    This imports all workouts that have not been imported to rowsandall.com. + The action may take a longer time to process, so please be patient. Click on Import in the list below to import an individual workout. +

    +
    • + +
  • + + + + + + + + + + + + + {% for workout in workouts %} + + + + + + + + + + {% endfor %} + +
    Import Name Date Duration Distance New
    + Import{{ workout|lookup:'name' }}{{ workout|lookup:'starttime' }}{{ workout|lookup:'duration' }} {{ workout|lookup:'distance' }} m{{ workout|lookup:'new' }}
    +
    • +
+{% else %} +

+ No workouts found +

+ {% endif %} + {% endblock %} + +{% block sidebar %} +{% include 'menu_workouts.html' %} +{% endblock %} diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py index 35adee66..79fe3065 100644 --- a/rowers/tests/mocks.py +++ b/rowers/tests/mocks.py @@ -621,6 +621,8 @@ def mocked_requests(*args, **kwargs): stravaworkoutlist = json.load(open('rowers/tests/testdata/stravaworkoutlist.txt')) sporttracksworkoutlist = json.load(open('rowers/tests/testdata/sporttracksworkouts.txt')) + nkworkoutlist = json.load(open('rowers/tests/testdata/nkworkouts.txt')) + rkworkoutlistjson = json.load(open('rowers/tests/testdata/rkworkoutslist.txt','r')) uaworkoutlistjson = json.load(open('rowers/tests/testdata/uaworkoutlist.txt','r')) @@ -732,6 +734,7 @@ def mocked_requests(*args, **kwargs): rktester = re.compile('.*?runkeeper\.com') uatester = re.compile('.*?mapmyfitness\.com') tptester = re.compile('.*?trainingpeaks\.com') + nktester = re.compile('.*?nkrowlink\.com') garmintester = re.compile('.*?garmin\.com') c2importregex = '.*?concept2.com\/api\/users\/me\/results\/\d+' @@ -746,6 +749,9 @@ def mocked_requests(*args, **kwargs): c2workoutlistregex = '.*?concept2\.com\/api\/users\/me\/results\?page=\d' c2workoutlisttester = re.compile(c2workoutlistregex) + nkworkoutlistregex = '.*?nkrowlink\.com\/api\/v1\/sessions' + nkworkoutlisttester = re.compile(nkworkoutlistregex) + stravaathleteregex = '.*?strava\.com\/api\/v3\/athlete$' stravaathletetester = re.compile(stravaathleteregex) @@ -796,6 +802,7 @@ def mocked_requests(*args, **kwargs): garmindownloadregex = '.*?garmin\.com\/mockfile?id=1' garmindownloadtester = re.compile(garmindownloadregex) + if garmintester.match(args[0]): if garmindownloadtester.match(args[0]): return MockStreamResponse('rowers/tests/testdata/3x250m.fit',200) @@ -910,6 +917,20 @@ def mocked_requests(*args, **kwargs): return MockResponse(sporttracksworkoutlist,200) + if nktester.match(args[0]): + if nkworkoutlisttester.match(args[0]): + return MockResponse(nkworkoutlist,200) + elif 'token' in args[0]: + json_data = { + "token_type": "Bearer", + "access_token": "987654321234567898765432123456789", + "refresh_token": "1234567898765432112345678987654321", + "expires_at": arrow.now().timestamp()+7200 + } + + return MockResponse(json_data,200) + + if stravatester.match(args[0]): if stravaworkoutlisttester.match(args[0]): return MockResponse(stravaworkoutlist,200) diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index a83d534e..9b0fb73c 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -360,6 +360,70 @@ class C2ObjectsTokenExpired(DjangoTestCase): self.assertEqual(response.status_code, 200) +#@pytest.mark.django_db +@override_settings(TESTING=True) +class NKObjects(DjangoTestCase): + def setUp(self): + self.c = Client() + self.u = User.objects.create_user('john', + 'sander@ds.ds', + 'koeinsloot') + + self.u.first_name = 'John' + self.u.last_name = 'Sander' + self.u.save() + self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True, + gdproptindate=timezone.now() + ) + + self.r.nktoken = '12' + self.r.nkrefreshtoken = '123' + self.r.nktokenexpirydate = datetime.datetime.now()-datetime.timedelta(days=1) + + self.r.save() + self.c.login(username='john',password='koeinsloot') + self.nu = datetime.datetime.now() + + filename = 'rowers/tests/testdata/testdata.csv' + + rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, + hrut1=self.r.ut1,hrat=self.r.at, + hrtr=self.r.tr,hran=self.r.an,ftp=self.r.ftp) + row = rdata(filename,rower=rr) + totaldist = row.df['cum_dist'].max() + totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min() + totaltime = totaltime+row.df.loc[:,' ElapsedTime (sec)'].iloc[0] + + + hours = int(totaltime/3600.) + minutes = int((totaltime - 3600.*hours)/60.) + seconds = int(totaltime - 3600.*hours - 60.*minutes) + tenths = int(10*(totaltime - 3600.*hours - 60.*minutes - seconds)) + + duration = "%s:%s:%s.%s" % (hours,minutes,seconds,tenths) + + + workoutdate = row.rowdatetime.strftime('%Y-%m-%d') + workoutstarttime = row.rowdatetime.strftime('%H:%M:%S') + + self.w = Workout.objects.create( + name='testworkout',workouttype='water', + user=self.r,date=self.nu.strftime('%Y-%m-%d'), + starttime=workoutstarttime, + startdatetime=row.rowdatetime, + duration=duration,distance=totaldist, + csvfilename=filename + ) + + @patch('rowers.nkstuff.requests.get', side_effect=mocked_requests) + @patch('rowers.nkstuff.requests.post', side_effect=mocked_requests) + def test_nk_list(self, mock_get, mockpost): + result = rowers.nkstuff.rower_nk_token_refresh(self.u) + self.assertEqual(result,"987654321234567898765432123456789") + response = self.c.get('/rowers/workout/nkimport/') + + self.assertEqual(response.status_code,200) + #@pytest.mark.django_db diff --git a/rowers/tests/testdata/nkworkoutlist.txt b/rowers/tests/testdata/nkworkoutlist.txt new file mode 100644 index 00000000..320a47cc --- /dev/null +++ b/rowers/tests/testdata/nkworkoutlist.txt @@ -0,0 +1,84 @@ +[ + { + "id": 1, + "name": "JustGo-7189M", + "type": 0, + "speedInput": 0, + "startTime": 1614264826, + "endTime": 1614269826, + "location": "Some Location", + "deviceId": 11, + "elapsedTime": 1140000, + "totalDistanceImp": 2920.69, + "totalDistanceGps": 2286.5, + "avgPaceImp": 195159.36302723, + "avgPaceGps": 250466.812537141, + "avgStrokeRate": 19.5, + "distStrokeImp": 8.51, + "distStrokeGps": 6.77, + "avgHeartRate": 158, + "totalStrokeCount": 343, + "totalCalories": 4959900, + "avgCalHour": 4482062.35252774, + "avgSpeedGps": 2, + "avgSpeedImp": 2.56, + "avgPower": 68.6979270660324, + "avgCatch": -46.7961491475831, + "avgSlip": 16.1616225246003, + "avgFinish": 48.1512290049444, + "avgWash": 22.9514686031976, + "avgForceAvg": 114.502194258813, + "avgWork": 210.785493336831, + "avgForceMax": 249.481436977143, + "avgMaxForceAngle": 4.75378911974861, + "startGpsLat": 39.7356346, + "startGpsLon": -75.5581928, + "intervals": [ + { + "id": 1, + "sessionId": 1, + "startTime": 1614264826, + "intervalNumber": 1, + "sessionStrokeStartIndex": 473, + "sessionStrokeEndIndex": 674, + "sessionStrokeCount": 91, + "elapsedTime": 1140000, + "totalDistanceImp": 2920.69, + "totalDistanceGps": 2286.5, + "avgPaceImp": 195159.36302723, + "avgPaceGps": 250466.812537141, + "avgStrokeRate": 19.5, + "distStrokeImp": 8.51, + "distStrokeGps": 6.77, + "avgHeartRate": 158, + "totalStrokeCount": 343, + "totalCalories": 4959900, + "avgCalHour": 4482062.35252774, + "avgSpeedGps": 2, + "avgSpeedImp": 2.56, + "avgPower": 68.6979270660324, + "avgCatch": -46.7961491475831, + "avgSlip": 16.1616225246003, + "avgFinish": 48.1512290049444, + "avgWash": 22.9514686031976, + "avgForceAvg": 114.502194258813, + "avgWork": 210.785493336831, + "avgForceMax": 249.481436977143, + "avgMaxForceAngle": 4.75378911974861, + "startGpsLat": 39.7356346, + "startGpsLon": -75.5581928 + } + ], + "oarlockSessions": [ + { + "id": 1, + "sessionId": 1, + "boatName": "Fast Boat", + "seatNumber": 3, + "portStarboard": 0, + "oarLength": 284, + "oarInboardLength": 85 + } + ] + } +] diff --git a/rowers/tests/testdata/nkworkouts.txt b/rowers/tests/testdata/nkworkouts.txt new file mode 100644 index 00000000..320a47cc --- /dev/null +++ b/rowers/tests/testdata/nkworkouts.txt @@ -0,0 +1,84 @@ +[ + { + "id": 1, + "name": "JustGo-7189M", + "type": 0, + "speedInput": 0, + "startTime": 1614264826, + "endTime": 1614269826, + "location": "Some Location", + "deviceId": 11, + "elapsedTime": 1140000, + "totalDistanceImp": 2920.69, + "totalDistanceGps": 2286.5, + "avgPaceImp": 195159.36302723, + "avgPaceGps": 250466.812537141, + "avgStrokeRate": 19.5, + "distStrokeImp": 8.51, + "distStrokeGps": 6.77, + "avgHeartRate": 158, + "totalStrokeCount": 343, + "totalCalories": 4959900, + "avgCalHour": 4482062.35252774, + "avgSpeedGps": 2, + "avgSpeedImp": 2.56, + "avgPower": 68.6979270660324, + "avgCatch": -46.7961491475831, + "avgSlip": 16.1616225246003, + "avgFinish": 48.1512290049444, + "avgWash": 22.9514686031976, + "avgForceAvg": 114.502194258813, + "avgWork": 210.785493336831, + "avgForceMax": 249.481436977143, + "avgMaxForceAngle": 4.75378911974861, + "startGpsLat": 39.7356346, + "startGpsLon": -75.5581928, + "intervals": [ + { + "id": 1, + "sessionId": 1, + "startTime": 1614264826, + "intervalNumber": 1, + "sessionStrokeStartIndex": 473, + "sessionStrokeEndIndex": 674, + "sessionStrokeCount": 91, + "elapsedTime": 1140000, + "totalDistanceImp": 2920.69, + "totalDistanceGps": 2286.5, + "avgPaceImp": 195159.36302723, + "avgPaceGps": 250466.812537141, + "avgStrokeRate": 19.5, + "distStrokeImp": 8.51, + "distStrokeGps": 6.77, + "avgHeartRate": 158, + "totalStrokeCount": 343, + "totalCalories": 4959900, + "avgCalHour": 4482062.35252774, + "avgSpeedGps": 2, + "avgSpeedImp": 2.56, + "avgPower": 68.6979270660324, + "avgCatch": -46.7961491475831, + "avgSlip": 16.1616225246003, + "avgFinish": 48.1512290049444, + "avgWash": 22.9514686031976, + "avgForceAvg": 114.502194258813, + "avgWork": 210.785493336831, + "avgForceMax": 249.481436977143, + "avgMaxForceAngle": 4.75378911974861, + "startGpsLat": 39.7356346, + "startGpsLon": -75.5581928 + } + ], + "oarlockSessions": [ + { + "id": 1, + "sessionId": 1, + "boatName": "Fast Boat", + "seatNumber": 3, + "portStarboard": 0, + "oarLength": 284, + "oarInboardLength": 85 + } + ] + } +] diff --git a/rowers/urls.py b/rowers/urls.py index e6d1fc04..977c80c9 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -567,6 +567,7 @@ urlpatterns = [ re_path(r'^workout/stravaimport/user/(?P\d+)/$',views.workout_stravaimport_view,name='workout_stravaimport_view'), re_path(r'^workout/c2import/all/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), re_path(r'^workout/c2import/all/(?P\d+)/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), + re_path(r'^workout/nkimport/$',views.workout_nkimport_view,name='workout_nkimport_view'), re_path(r'^workout/rp3import/(?P\d+)/$',views.workout_getrp3importview, name='workout_getrp3importview'), re_path(r'^workout/rp3import/all/$',views.workout_getrp3workout_all,name='workout_getrp3workout_all'), diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index e5bdbaba..7e1a86d7 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -411,6 +411,8 @@ def rower_nk_authorize(request): return HttpResponseRedirect(url) + + # Concept2 authorization @login_required() def rower_c2_authorize(request): @@ -679,7 +681,7 @@ def rower_process_callback(request): message = "The resource owner or authorization server denied the request" messages.error(request,message) - url = reverse('workouts_view') + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -689,7 +691,7 @@ def rower_process_callback(request): message += ' Contact info@rowsandall.com if this behavior persists.' messages.error(request,message) - url = reverse('workouts_view') + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -775,11 +777,105 @@ def rower_process_garmincallback(request): @login_required() def rower_process_nkcallback(request): # do stuff + try: + code = request.get['code'] + res = nkstuff.get_token['code'] + except MultiValueDictKeyError: + message = "The resource owner or authorization server denied the request" + messages.error(request,message) + 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' + messages.error(request,message) + + url = reverse('rower_exportsettings_view') + + return HttpResponseRedirect(url) + + expires_in = res[1] + refresh_token = res[2] + expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in) + + r = getrower(request.user) + r.nktoken = access_token + r.nktokenexpirydate = expirydatetime + r.nkrefreshtoken = refresh_token + + r.save() + + successmessage = "Tokens stored. Good to go. Please check your import/export settings" + messages.info(request,successmessage) url = reverse('rower_exportsettings_view') - return HttpResponseRedirect(url) +@login_required() +@permission_required('rower.is_coach',fn=get_user_by_userid, raise_exception=True) +def workout_nkimport_view(request,userid=0): + r = getrequestrower(request,userid=userid) + try: + thetoken = nk_open(request.user) + except NoTokenError: + return HttpResponseRedirect("/rowers/me/stravaauthorize/") + + res = nkstuff.get_nk_workout_list(request.user) + + if (res.status_code != 200): + if (res.status_code == 401): + r = getrower(request.user) + if (r.stravatoken == '') or (r.stravatoken is None): + s = "Token doesn't exist. Need to authorize" + return HttpResponseRedirect("/rowers/me/stravaauthorize/") + message = "Something went wrong in workout_stravaimport_view" + messages.error(request,message) + url = reverse('workouts_view') + return HttpResponseRedirect(url) + + # get NK IDs + + nkdata = [{ + 'id':int(item['id']), + 'elapsed_time':item['elapsedTime'], + 'start_date':item['startTime'], + } for item in res.json()] + + workouts = [] + + for item in res.json(): + d = int(float(item['totalDistanceGps'])) # could also be Impeller + i = item['id'] + n = item['name'] + nnn = '' + ttot = str(datetime.timedelta(seconds=int(float(item['elapsedTime'])/1000.))) + s = item['startTime'] + keys = ['id','distance','duration','starttime','name','new'] + values = [i,d,ttot,s,n,nnn] + res = dict(zip(keys, values)) + workouts.append(res) + + breadcrumbs = [ + { + 'url':'/rowers/list-workouts/', + 'name':'Workouts' + }, + { + 'url':reverse('workout_nkimport_view'), + 'name':'Strava' + }, + ] + + return render(request,'nk_list_import.html', + { + 'workouts':workouts, + 'rower':r, + 'active':'nav-workouts', + 'breadcrumbs':breadcrumbs, + 'teams':get_my_teams(request.user) + }) # Process Strava Callback @login_required() diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 88b7f36b..b323beb1 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -154,7 +154,9 @@ import os,sys import datetime import iso8601 import rowers.c2stuff as c2stuff +import rowers.nkstuff as nkstuff from rowers.c2stuff import c2_open +from rowers.nkstuff import nk_open from rowers.rp3stuff import rp3_open from rowers.runkeeperstuff import runkeeper_open from rowers.sporttracksstuff import sporttracks_open @@ -186,7 +188,7 @@ from rowsandall_app.settings import ( BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY, PAYMENT_PROCESSING_ON, RECAPTCHA_SITE_KEY, RECAPTCHA_SITE_SECRET, - NK_REDIRECT_URI, NK_ClIENT_ID, NK_CLIENT_SECRET + NK_REDIRECT_URI, NK_CLIENT_ID, NK_CLIENT_SECRET ) #from rowers.tasks_standalone import addcomment2 diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 7fd1c457..f6c45d9d 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -329,9 +329,10 @@ RP3_REDIRECT_URI = CFG["rp3_redict_uri"] RP3_CLIENT_KEY = RP3_CLIENT_ID # Nielsen-Kellerman -NK_ClIENT_ID = CFG["nk_client_id"] +NK_CLIENT_ID = CFG["nk_client_id"] NK_CLIENT_SECRET = CFG["nk_client_secret"] NK_REDIRECT_URI = CFG["nk_redirect_uri"] +NK_API_LOCATION = CFG["nk_api_location"] # Full Site URL SITE_URL = CFG['site_url'] From e9b39d83506f1eda49c6d5979ce1476ee4a2631b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 31 Mar 2021 07:41:00 +0200 Subject: [PATCH 04/18] small progress on nk link --- rowers/imports.py | 2 +- rowers/models.py | 1 + rowers/nkstuff.py | 37 ++++++++++++++++++++++++++++++++++++- rowers/views/importviews.py | 10 +++++++--- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/rowers/imports.py b/rowers/imports.py index 821300fc..3aedd9db 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -266,7 +266,7 @@ def imports_get_token( except (ValueError,TypeError): expires_in = 0 else: - return [0,0,0] + return [0,response.text,0] return [thetoken,expires_in,refresh_token] diff --git a/rowers/models.py b/rowers/models.py index c93db7fb..05200a7e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3187,6 +3187,7 @@ class Workout(models.Model): uploadedtorunkeeper = models.BigIntegerField(default=0) uploadedtogarmin = models.BigIntegerField(default=0) uploadedtorp3 = models.BigIntegerField(default=0) + uploadedtonk = models.BigIntegerField(default=0) forceunit = models.CharField(default='lbs', choices = ( ('lbs','lbs'), diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index f5dbfb61..37d91aba 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -12,6 +12,8 @@ import requests #https://oauth-stage.nkrowlink.com/oauth/authorizegrant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=fc8fc3d8-ce0a-443e-838a-1c06fb5317c6&redirect_uri=https%3A%2F%2Fdunav.ngrok.io%2Fnk_callback%2F #https://oauth-stage.nkrowlink.com/oauth/authorize?grant_type=authorization_code&response_type=code&client_id=rowsandall-staging&scope=read&state=1234&redirect_uri=https%3A%2F%2Fdev.rowsandall.com%2Fnk_callback +from requests_oauthlib import OAuth2Session + import django_rq queue = django_rq.get_queue('default') queuelow = django_rq.get_queue('low') @@ -48,11 +50,22 @@ oauth_data = { 'expirydatename': 'nktokenexpirydate', 'bearer_auth': True, 'base_url': "https://oauth-stage.nkrowlink.com/oauth/token", - 'grant_type': 'refresh_token', 'scope':'read', } def get_token(code): + #client_id = oauth_data['client_id'] + #client_secret = oauth_data['client_secret'] + #base_uri = oauth_data['base_url'] + + #callbackuri = 'https://'+callbackuri[9:] + #print(callbackuri) + + #nk = OAuth2Session(client_id) + #token = nk.fetch_token(base_uri,client_secret=client_secret,authorization_response=callbackuri) + + #print(token) + #return [0,0,0] return imports_get_token(code, oauth_data) def nk_open(user): @@ -105,3 +118,25 @@ def get_nk_workout_list(user,fake=False): s = requests.get(url,headers=headers,params=params) return s + +def get_nk_workout_strokes(user,nkid): + r = Rower.objects.get(user=user) + + if (r.nktoken == '') or (r.nktoken is None): + return custom_exception_handler(401,s) + s = "Token doesn't exist. Need to authorize" + elif (timezone.now()>r.tokenexpirydate): + s = "Token expired. Needs to refresh." + return custom_exception_handler(401,s) + else: + # ready to fetch. Hurray + authorizationstring = str('Bearer ' + r.nktoken) + headers = {'Authorization': authorizationstring, + 'user-agent': 'sanderroosendaal', + 'Content-Type': 'application/json'} + url = "https://log.concept2.com/api/users/me/results/"+str(nkid)+"/strokes" + s = requests.get(url,headers=headers) + + return s +# +#def get_workout(user,nkid): diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 7e1a86d7..8be07e00 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -401,7 +401,7 @@ def rower_nk_authorize(request): params = { "grant_type": "authorization_code", "response_type": "code", - "client_id": NK_ClIENT_ID, + "client_id": NK_CLIENT_ID, "scope": scope, "state": state, "redirect_uri": NK_REDIRECT_URI, @@ -776,10 +776,11 @@ def rower_process_garmincallback(request): # Process NK Callback @login_required() def rower_process_nkcallback(request): + uri = request.build_absolute_uri() # do stuff try: - code = request.get['code'] - res = nkstuff.get_token['code'] + code = request.GET.get('code',None) + res = nkstuff.get_token(code) except MultiValueDictKeyError: message = "The resource owner or authorization server denied the request" messages.error(request,message) @@ -787,6 +788,9 @@ def rower_process_nkcallback(request): url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) + uri = request.build_absolute_uri() + + print(res) access_token = res[0] if access_token == 0: message = res[1] From af4dc4bc29434cd09d0f9d66cc1901def61f3e12 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 31 Mar 2021 13:59:30 +0200 Subject: [PATCH 05/18] still not working token exchagen --- rowers/imports.py | 1 + rowers/nkstuff.py | 20 +++++++++++++++----- rowers/views/importviews.py | 7 ++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/rowers/imports.py b/rowers/imports.py index 3aedd9db..cb1cb83f 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -201,6 +201,7 @@ def imports_get_token( code,oauth_data ): + redirect_uri = oauth_data['redirect_uri'] client_secret = oauth_data['client_secret'] client_id = oauth_data['client_id'] diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index 37d91aba..f79ec9e0 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -53,20 +53,30 @@ oauth_data = { 'scope':'read', } -def get_token(code): +def get_token(code,callbackuri): #client_id = oauth_data['client_id'] #client_secret = oauth_data['client_secret'] #base_uri = oauth_data['base_url'] - #callbackuri = 'https://'+callbackuri[9:] - #print(callbackuri) - #nk = OAuth2Session(client_id) #token = nk.fetch_token(base_uri,client_secret=client_secret,authorization_response=callbackuri) #print(token) #return [0,0,0] - return imports_get_token(code, oauth_data) + url = oauth_data['base_url'] + data = {"client_id": oauth_data['client_id'], + "grant_type": "authorization_code", + "redirect_uri": oauth_data['redirect_uri'], + "client_secret": oauth_data['client_secret'], + "code": code, +# "scope":oauth_data['scope'], + } + #url = url+'?'+urllib.parse.urlencode(params) + print(url) + response = requests.post(url,data=data) + print(response.reason) + return [0,response.text,0] + #return imports_get_token(code, oauth_data) def nk_open(user): t = time.localtime() diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 8be07e00..33f52fe3 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -777,10 +777,15 @@ def rower_process_garmincallback(request): @login_required() def rower_process_nkcallback(request): uri = request.build_absolute_uri() + uri = 'https://dunav.ngrok.io/'+uri[22:] + print(uri) + print(request.GET.get('code')) + raise ValueError + # do stuff try: code = request.GET.get('code',None) - res = nkstuff.get_token(code) + res = nkstuff.get_token(code,uri) except MultiValueDictKeyError: message = "The resource owner or authorization server denied the request" messages.error(request,message) From bffefdb12646a13f6396d94096cb7c4160bf6aad Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 31 Mar 2021 16:41:52 +0200 Subject: [PATCH 06/18] fix --- rowers/nkstuff.py | 22 +++++++++++++++++----- rowers/views/importviews.py | 3 --- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index f79ec9e0..6c680a6e 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -53,6 +53,9 @@ oauth_data = { 'scope':'read', } +import http.client as http_client +http_client.HTTPConnection.debuglevel = 1 + def get_token(code,callbackuri): #client_id = oauth_data['client_id'] #client_secret = oauth_data['client_secret'] @@ -64,17 +67,26 @@ def get_token(code,callbackuri): #print(token) #return [0,0,0] url = oauth_data['base_url'] - data = {"client_id": oauth_data['client_id'], + + headers = {'Accept': 'application/json', + #'Api-Key': oauth_data['client_id'], + #'Content-Type': 'application/x-www-form-urlencoded', + #'user-agent': 'sanderroosendaal' + } + + post_data = {"client_id": oauth_data['client_id'], "grant_type": "authorization_code", "redirect_uri": oauth_data['redirect_uri'], "client_secret": oauth_data['client_secret'], "code": code, + #"response_type": "code", # "scope":oauth_data['scope'], } - #url = url+'?'+urllib.parse.urlencode(params) - print(url) - response = requests.post(url,data=data) - print(response.reason) + + + + response = requests.post(url,data=json.dumps(post_data),headers=headers) + print('Status Code',response.status_code) return [0,response.text,0] #return imports_get_token(code, oauth_data) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 33f52fe3..9a689123 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -779,8 +779,6 @@ def rower_process_nkcallback(request): uri = request.build_absolute_uri() uri = 'https://dunav.ngrok.io/'+uri[22:] print(uri) - print(request.GET.get('code')) - raise ValueError # do stuff try: @@ -795,7 +793,6 @@ def rower_process_nkcallback(request): uri = request.build_absolute_uri() - print(res) access_token = res[0] if access_token == 0: message = res[1] From 5c6ed8ef163c75dd5047df85bc4a52b5d655c11d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 1 Apr 2021 09:40:01 +0200 Subject: [PATCH 07/18] workout list nk import working --- rowers/models.py | 1 + rowers/nkstuff.py | 98 +++++++++++++++------- rowers/templates/rower_exportsettings.html | 3 + rowers/views/importviews.py | 21 ++--- 4 files changed, 85 insertions(+), 38 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 05200a7e..616a6216 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1001,6 +1001,7 @@ class Rower(models.Model): nktokenexpirydate = models.DateTimeField(blank=True,null=True) nkrefreshtoken = models.TextField(default='',max_length=1000, blank=True,null=True) + nk_owner_id = models.BigIntegerField(default=0) trainingpeaks_auto_export = models.BooleanField(default=False) diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index 6c680a6e..b8173755 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -53,51 +53,84 @@ oauth_data = { 'scope':'read', } -import http.client as http_client -http_client.HTTPConnection.debuglevel = 1 +from requests.auth import HTTPBasicAuth -def get_token(code,callbackuri): - #client_id = oauth_data['client_id'] - #client_secret = oauth_data['client_secret'] - #base_uri = oauth_data['base_url'] - - #nk = OAuth2Session(client_id) - #token = nk.fetch_token(base_uri,client_secret=client_secret,authorization_response=callbackuri) - - #print(token) - #return [0,0,0] +def get_token(code): url = oauth_data['base_url'] + headers = {'Accept': 'application/json', - #'Api-Key': oauth_data['client_id'], - #'Content-Type': 'application/x-www-form-urlencoded', + #'Authorization': auth_header, + 'Content-Type': 'application/x-www-form-urlencoded', #'user-agent': 'sanderroosendaal' } + + post_data = {"client_id": oauth_data['client_id'], "grant_type": "authorization_code", "redirect_uri": oauth_data['redirect_uri'], - "client_secret": oauth_data['client_secret'], "code": code, - #"response_type": "code", -# "scope":oauth_data['scope'], } + response = requests.post(url,auth=HTTPBasicAuth(oauth_data['client_id'],oauth_data['client_secret']), + data=post_data) + if response.status_code != 200: + return [0,response.text,0,0] + + token_json = response.json() + + access_token = token_json['access_token'] + refresh_token = token_json['refresh_token'] + expires_in = token_json['expires_in'] + nk_owner_id = token_json['user_id'] + + return [access_token, expires_in, refresh_token,nk_owner_id] - response = requests.post(url,data=json.dumps(post_data),headers=headers) - print('Status Code',response.status_code) - return [0,response.text,0] - #return imports_get_token(code, oauth_data) def nk_open(user): - t = time.localtime() - timestamp = time.strftime('%b-%d-%Y_%H%M', t) - token = imports_open(user,oauth_data) - return token + r = Rower.objects.get(user=user) + print(r.nktokenexpirydate) + if (r.nktoken == '') or (r.nktoken is None): + s = "Token doesn't exist. Need to authorize" + raise NoTokenError("User has no token") + else: + if (timezone.now()>r.nktokenexpirydate): + thetoken = rower_nk_token_refresh(user) + if thetoken == None: + raise NoTokenError("User has no token") + return thetoken + else: + thetoken = r.nktoken + + return thetoken def do_refresh_token(refreshtoken): - return imports_do_refresh_token(refreshtoken, oauth_data) + post_data = {"grant_type": "refresh_token", + #"client_id":NK_CLIENT_ID, + "refresh_token": refreshtoken, + } + + url = oauth_data['base_url'] + + response = requests.post(url,data=post_data,auth=HTTPBasicAuth(oauth_data['client_id'],oauth_data['client_secret'])) + + print(response.request.headers) + print(post_data) + print(response.status_code,response.text) + + if response.status_code != 200: + return [0,0,0] + + token_json = response.json() + + access_token = token_json['access_token'] + refresh_token = token_json['refresh_token'] + expires_in = token_json['expires_in'] + + return access_token, expires_in, refresh_token + def rower_nk_token_refresh(user): r = Rower.objects.get(user=user) @@ -128,16 +161,25 @@ def get_nk_workout_list(user,fake=False): return custom_exception_handler(401,s) else: # ready to fetch. Hurray + endTime = int(arrow.now().timestamp())*1000 + endTime = str(endTime) + startTime = arrow.now()-timedelta(days=90)*1000 + startTime = str(int(startTime.timestamp())) authorizationstring = str('Bearer ' + r.nktoken) headers = {'Authorization': authorizationstring, 'user-agent': 'sanderroosendaal', - 'Content-Type': 'application/json'} + 'Content-Type': 'application/json', + } url = NK_API_LOCATION+"api/v1/sessions" - params = {} # start / end time + params = { + 'startTime':startTime, + 'endTime':endTime, + } # start / end time s = requests.get(url,headers=headers,params=params) + #print(s.status_code,s.json()) return s diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html index 06b3a874..6cabf41f 100644 --- a/rowers/templates/rower_exportsettings.html +++ b/rowers/templates/rower_exportsettings.html @@ -11,6 +11,9 @@ {% if rower.c2token is not None and rower.c2token != '' %} Concept2 Logbook, {% endif %} + {% if rower.nktoken is not None and rower.nktoken != '' %} + NK LiNK, + {% endif %} {% if rower.sporttrackstoken is not None and rower.sporttrackstoken != '' %} SportTracks, {% endif %} diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 9a689123..d5fb53d1 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -776,14 +776,10 @@ def rower_process_garmincallback(request): # Process NK Callback @login_required() def rower_process_nkcallback(request): - uri = request.build_absolute_uri() - uri = 'https://dunav.ngrok.io/'+uri[22:] - print(uri) - # do stuff try: code = request.GET.get('code',None) - res = nkstuff.get_token(code,uri) + res = nkstuff.get_token(code) except MultiValueDictKeyError: message = "The resource owner or authorization server denied the request" messages.error(request,message) @@ -791,8 +787,6 @@ def rower_process_nkcallback(request): url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) - uri = request.build_absolute_uri() - access_token = res[0] if access_token == 0: message = res[1] @@ -805,12 +799,14 @@ def rower_process_nkcallback(request): expires_in = res[1] refresh_token = res[2] + 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.save() @@ -836,7 +832,7 @@ def workout_nkimport_view(request,userid=0): if (r.stravatoken == '') or (r.stravatoken is None): s = "Token doesn't exist. Need to authorize" return HttpResponseRedirect("/rowers/me/stravaauthorize/") - message = "Something went wrong in workout_stravaimport_view" + message = "Something went wrong in workout_nkimport_view" messages.error(request,message) url = reverse('workouts_view') return HttpResponseRedirect(url) @@ -846,7 +842,7 @@ def workout_nkimport_view(request,userid=0): nkdata = [{ 'id':int(item['id']), 'elapsed_time':item['elapsedTime'], - 'start_date':item['startTime'], + 'start_date':arrow.get(item['startTime']), } for item in res.json()] workouts = [] @@ -857,12 +853,17 @@ def workout_nkimport_view(request,userid=0): n = item['name'] nnn = '' ttot = str(datetime.timedelta(seconds=int(float(item['elapsedTime'])/1000.))) - s = item['startTime'] + s = arrow.get(item['startTime'],tzinfo=r.defaulttimezone).format(arrow.FORMAT_W3C) + #s = arrow.get(item['startTime']).to(r.defaulttimezone).isoformat() keys = ['id','distance','duration','starttime','name','new'] values = [i,d,ttot,s,n,nnn] res = dict(zip(keys, values)) workouts.append(res) + workouts = workouts[::-1] + + print(workouts) + breadcrumbs = [ { 'url':'/rowers/list-workouts/', From 047035f62e800371d295a97dc0564862b677d89c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 1 Apr 2021 11:10:51 +0200 Subject: [PATCH 08/18] passing tests for nk_list --- rowers/nkstuff.py | 12 +++++------- rowers/templates/menu_workouts.html | 1 + rowers/templates/nk_list_import.html | 4 ++-- rowers/tests/mocks.py | 7 +++++++ rowers/tests/test_imports.py | 2 +- rowers/views/importviews.py | 8 +++----- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index b8173755..0c661a55 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -97,6 +97,7 @@ def nk_open(user): raise NoTokenError("User has no token") else: if (timezone.now()>r.nktokenexpirydate): + print('refreshing token') thetoken = rower_nk_token_refresh(user) if thetoken == None: raise NoTokenError("User has no token") @@ -115,10 +116,7 @@ def do_refresh_token(refreshtoken): url = oauth_data['base_url'] response = requests.post(url,data=post_data,auth=HTTPBasicAuth(oauth_data['client_id'],oauth_data['client_secret'])) - - print(response.request.headers) - print(post_data) - print(response.status_code,response.text) + print(response.status_code) if response.status_code != 200: return [0,0,0] @@ -152,11 +150,11 @@ def make_authorization_url(request): def get_nk_workout_list(user,fake=False): r = Rower.objects.get(user=user) - + print(r.nktoken,r.nktokenexpirydate) if (r.nktoken == '') or (r.nktoken is None): s = "Token doesn't exist. Need to authorize" return custom_exception_handler(401,s) - elif (r.nktokenexpirydate is None or timezone.now()+timedelta(seconds=3599)>r.nktokenexpirydate): + elif (r.nktokenexpirydate is None or timezone.now()+timedelta(seconds=10)>r.nktokenexpirydate): s = "Token expired. Needs to refresh." return custom_exception_handler(401,s) else: @@ -179,7 +177,7 @@ def get_nk_workout_list(user,fake=False): } # start / end time s = requests.get(url,headers=headers,params=params) - #print(s.status_code,s.json()) + return s diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html index aea1c84f..73c22bdf 100644 --- a/rowers/templates/menu_workouts.html +++ b/rowers/templates/menu_workouts.html @@ -38,6 +38,7 @@