Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2021-12-17 10:58:17 +01:00
parent e1931065f9
commit 1c045f773a
6 changed files with 23 additions and 21 deletions

View File

@@ -37,8 +37,7 @@ import rowers.stravastuff as stravastuff
import rowers.nkstuff as nkstuff import rowers.nkstuff as nkstuff
from rowers.opaque import encoder from rowers.opaque import encoder
from rowers.models import User,VirtualRace,Workout from rowers.models import User,Workout
from rowers.plannedsessions import email_submit_race
from rowers.rower_rules import user_is_not_basic from rowers.rower_rules import user_is_not_basic
from rowers.utils import dologging from rowers.utils import dologging
@@ -90,7 +89,7 @@ class Command(BaseCommand):
try: try:
polar_available = polarstuff.get_polar_notifications() polar_available = polarstuff.get_polar_notifications()
res = polarstuff.get_all_new_workouts(polar_available) res = polarstuff.get_all_new_workouts(polar_available)
except: except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback) lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
dologging('processemail.log',''.join('!! ' + line for line in lines)) dologging('processemail.log',''.join('!! ' + line for line in lines))
@@ -101,7 +100,7 @@ class Command(BaseCommand):
for r in rowers: # pragma: no cover for r in rowers: # pragma: no cover
if user_is_not_basic(r.user): if user_is_not_basic(r.user):
c2stuff.get_c2_workouts(r) c2stuff.get_c2_workouts(r)
except: except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback) lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
dologging('processemail.log',''.join('!! ' + line for line in lines)) dologging('processemail.log',''.join('!! ' + line for line in lines))
@@ -112,7 +111,7 @@ class Command(BaseCommand):
for r in rowers: # pragma: no cover for r in rowers: # pragma: no cover
if user_is_not_basic(r.user): if user_is_not_basic(r.user):
res = rp3stuff.get_rp3_workouts(r) res = rp3stuff.get_rp3_workouts(r)
except: except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback) lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
dologging('processemail.log',''.join('!! ' + line for line in lines)) dologging('processemail.log',''.join('!! ' + line for line in lines))
@@ -124,7 +123,7 @@ class Command(BaseCommand):
s = 'Starting NK Auto Import for user {id}'.format(id=r.user.id) s = 'Starting NK Auto Import for user {id}'.format(id=r.user.id)
dologging('nklog.log',s) dologging('nklog.log',s)
res = nkstuff.get_nk_workouts(r) res = nkstuff.get_nk_workouts(r)
except: except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback) lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
dologging('processemail.log',''.join('!! ' + line for line in lines)) dologging('processemail.log',''.join('!! ' + line for line in lines))

View File

@@ -114,7 +114,7 @@ def make_authorization_url(): # pragma: no cover
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
def get_polar_notifications(): def get_polar_notifications(): # pragma: no cover
url = baseurl+'/notifications' url = baseurl+'/notifications'
state = str(uuid4()) state = str(uuid4())
auth_string = '{id}:{secret}'.format( auth_string = '{id}:{secret}'.format(

View File

@@ -285,7 +285,7 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|',workouttype='rower'):
@app.task @app.task
def handle_request_post(url, data,debug=False, **kwargs): def handle_request_post(url, data,debug=False, **kwargs): # pragma: no cover
response = requests.post(url,data) response = requests.post(url,data)
return response.status_code return response.status_code
@@ -1369,7 +1369,8 @@ def handle_send_email_transaction(
@app.task @app.task
def handle_send_email_instantplan_notification( def handle_send_email_instantplan_notification(
username, useremail, amount, planname,startdate, enddate, **kwargs): username, useremail, amount, planname,startdate, enddate, **kwargs
): # pragma: no cover
if 'debug' in kwargs: # pragma: no cover if 'debug' in kwargs: # pragma: no cover
debug = kwargs['debug'] debug = kwargs['debug']
@@ -1537,7 +1538,7 @@ def handle_sendemail_raceregistration(
def handle_sendemail_coursesucceed( def handle_sendemail_coursesucceed(
useremail, username, logfile, workoutid, **kwargs useremail, username, logfile, workoutid, **kwargs
): ): # pragma: no cover
if 'debug' in kwargs: # pragma: no cover if 'debug' in kwargs: # pragma: no cover
debug = kwargs['debug'] debug = kwargs['debug']
else: else:
@@ -3246,7 +3247,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
splitdata = None splitdata = None
distance = data['distance'] distance = data['distance']
try: try: # pragma: no cover
rest_distance = data['rest_distance'] rest_distance = data['rest_distance']
rest_time = data['rest_time']/10. rest_time = data['rest_time']/10.
except KeyError: except KeyError:
@@ -3325,7 +3326,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
#dologging('debuglog.log',json.dumps(s.json())) #dologging('debuglog.log',json.dumps(s.json()))
try: try:
strokedata = pd.DataFrame.from_dict(s.json()['data']) strokedata = pd.DataFrame.from_dict(s.json()['data'])
except AttributeError: except AttributeError: # pragma: no cover
dologging('debuglog.log','No stroke data in stroke data') dologging('debuglog.log','No stroke data in stroke data')
return 0 return 0
@@ -3333,7 +3334,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
res = make_cumvalues(0.1*strokedata['t']) res = make_cumvalues(0.1*strokedata['t'])
cum_time = res[0] cum_time = res[0]
lapidx = res[1] lapidx = res[1]
except KeyError: except KeyError: # pragma: no cover
dologging('debuglog.log','No time values in stroke data') dologging('debuglog.log','No time values in stroke data')
return 0 return 0
@@ -3639,7 +3640,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
'power':power, 'power':power,
'strokelength':strokelength, 'strokelength':strokelength,
}) })
except ValueError: except ValueError: # pragma: no cover
return 0 return 0
try: try:
@@ -3654,7 +3655,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
try: try:
if 'summary_polyline' in workoutsummary['map'] and workouttype=='rower': # pragma: no cover if 'summary_polyline' in workoutsummary['map'] and workouttype=='rower': # pragma: no cover
workouttype = 'water' workouttype = 'water'
except KeyError: except KeyError: # pragma: no cover
pass pass
try: try:

View File

@@ -587,7 +587,7 @@ class ChallengesTest(TestCase):
} }
form = CourseSelectForm(formdata) form = CourseSelectForm(formdata)
self.assertTrue(form.is_valid()) self.assertTrue(form.is_valid())
response = self.c.post(url, formdata, follow=True) response = self.c.post(url, formdata, follow=True)
@@ -817,6 +817,7 @@ class ChallengesTest(TestCase):
'yparam': 'spm', 'yparam': 'spm',
'plottype': 'line', 'plottype': 'line',
'teamid':0, 'teamid':0,
'course':self.ThyroBaantje.id,
} }
form = ChartParamChoiceForm(form_data) form = ChartParamChoiceForm(form_data)
self.assertTrue(form.is_valid()) self.assertTrue(form.is_valid())
@@ -833,6 +834,7 @@ class ChallengesTest(TestCase):
'yparam': 'spm', 'yparam': 'spm',
'plottype': 'line', 'plottype': 'line',
'teamid':0, 'teamid':0,
'course':self.ThyroBaantje.id
} }
form = ChartParamChoiceForm(form_data) form = ChartParamChoiceForm(form_data)
self.assertTrue(form.is_valid()) self.assertTrue(form.is_valid())

View File

@@ -120,7 +120,7 @@ def dologging(filename,s):
f.write(' ') f.write(' ')
f.write(s) f.write(s)
def to_pace(pace): def to_pace(pace): # pragma: no cover
minutes, seconds = divmod(pace,60) minutes, seconds = divmod(pace,60)
seconds, rest = divmod(seconds, 1) seconds, rest = divmod(seconds, 1)
tenths = int(rest*10) tenths = int(rest*10)
@@ -518,7 +518,7 @@ def custom_exception_handler(exc,message):
return res return res
def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high',authorizationstring=''): def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high',authorizationstring=''):
if r is not None: if r is not None: # pragma: no cover
authorizationstring = str('Bearer ' + r.stravatoken) authorizationstring = str('Bearer ' + r.stravatoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
@@ -569,7 +569,7 @@ def allsundays(startdate,enddate):
yield d yield d
d += datetime.timedelta(days=7) d += datetime.timedelta(days=7)
def steps_read_fit(filename,name='',sport='Custom'): def steps_read_fit(filename,name='',sport='Custom'): # pragma: no cover
authorizationstring = 'Bearer '+settings.WORKOUTS_FIT_TOKEN authorizationstring = 'Bearer '+settings.WORKOUTS_FIT_TOKEN
url = settings.WORKOUTS_FIT_URL+"/tojson" url = settings.WORKOUTS_FIT_URL+"/tojson"
headers = {'Authorization':authorizationstring} headers = {'Authorization':authorizationstring}
@@ -622,7 +622,7 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7):
distance = avgspeed*seconds distance = avgspeed*seconds
rscore = 60.*seconds/3600. rscore = 60.*seconds/3600.
if targettype == 'Speed': if targettype == 'Speed': # pragma: no cover
value = step.get('targetValue',0) value = step.get('targetValue',0)
valuelow = step.get('targetValueLow',0) valuelow = step.get('targetValueLow',0)
valuehigh = step.get('targetValueHigh',0) valuehigh = step.get('targetValueHigh',0)

View File

@@ -6555,7 +6555,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
course=course, course=course,
workoutid=row.id workoutid=row.id
) )
if records: if records: # pragma: no cover
record = records[0] record = records[0]
else: else:
# create record # create record