removed UnderArmour / MapMyFitness

rowers/c2stuff.py

@@ -22,15 +22,7 @@ from scipy import optimize
 from json.decoder import JSONDecodeError
 
 from pytz.exceptions import UnknownTimeZoneError
-
-def dologging(s):
-    tstamp = time.localtime()
-    timestamp = time.strftime('%b-%d-%Y %H:%M:%S', tstamp)
-    with open('debuglog.log','a') as f:
-        f.write('\n')
-        f.write(timestamp)
-        f.write(' ')
-        f.write(s)
+from rowers.utils import dologging
 
 from rowsandall_app.settings import (
     C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
@@ -39,6 +31,7 @@ from rowsandall_app.settings import (
 
 from rowers.tasks import (
     handle_c2_import_stroke_data, handle_c2_sync, handle_c2_async_workout,
+    handle_c2_getworkout
     )
 import django_rq
 queue = django_rq.get_queue('default')
@@ -840,64 +833,15 @@ def get_workout(user,c2id,do_async=False):
     elif (timezone.now()>r.tokenexpirydate):
         s = "Token expired. Needs to refresh."
         return custom_exception_handler(401,s),0
-    else:
-        # ready to fetch. Hurray
-        authorizationstring = str('Bearer ' + r.c2token)
-        headers = {'Authorization': authorizationstring,
-                   'user-agent': 'sanderroosendaal',
-                   'Content-Type': 'application/json'}
-        url = "https://log.concept2.com/api/users/me/results/"+str(c2id)
-        s = requests.get(url,headers=headers)
 
-        if s.status_code != 200: # pragma: no cover
-            if s.status_code == 404:
-                raise PermissionDenied("You have no access to this resource")
-            else:
-                s = "Something went wrong with the import"
-                return custom_exception_handler(401,s), 0
+    job = myqueue(queuehigh,
+                  handle_c2_getworkout,
+                  user.id,
+                  r.c2token,
+                  c2id,
+                  r.defaulttimezone)
 
-    data = s.json()['data']
-    alldata = {c2id:data}
-    splitdata = None
-    #with open('c2temp.json','w') as f:
-    #    f.write(json.dumps(s.json()))
-    #    print(s.json())
-
-    if do_async:
-        print('aap',alldata)
-        job = myqueue(queuehigh,
-                      handle_c2_async_workout,
-                      alldata,
-                      r.user.id,
-                      r.c2token,
-                      c2id,
-                      0,
-                      r.defaulttimezone)
-
-        return data, pd.DataFrame()
-
-
-    if 'workout' in data:
-        if 'splits' in data['workout']: # pragma: no cover
-            splitdata = data['workout']['splits']
-        elif 'intervals' in data['workout']: # pragma: no cover
-            splitdata = data['workout']['intervals']
-        else: # pragma: no cover
-            splitdata = None
-
-    # Check if workout has stroke data, and get the stroke data
-
-    if data['stroke_data']:
-        res2 = get_c2_workout_strokes(user,c2id)
-        if res2.status_code == 200:
-            strokedata = pd.DataFrame.from_dict(res2.json()['data'])
-        else: # pragma: no cover
-            strokedata = pd.DataFrame()
-    else: # pragma: no cover
-        strokedata = pd.DataFrame()
-
-
-    return data,strokedata
+    return 1
 
 # Get stroke data belonging to C2 ID
 def get_c2_workout_strokes(user,c2id):
@@ -1027,9 +971,9 @@ def workout_c2_upload(user,w,asynchron=False):
         if not c2userid: # pragma: no cover
             raise NoTokenError("User has no token")
 
-        dologging('Upload to C2 user {userid}'.format(userid=user.id))
+        dologging('debuglog.log','Upload to C2 user {userid}'.format(userid=user.id))
         data = createc2workoutdata(w)
-        dologging(json.dumps(data))
+        dologging('debuglog.log',json.dumps(data))
 
         if data == 0: # pragma: no cover
             return "Error: No data file. Contact info@rowsandall.com if the problem persists",0