bug fix sporttracks no gps

rowers/sporttracksstuff.py

@@ -9,6 +9,8 @@ from rowsandall_app.settings import (
     SPORTTRACKS_REDIRECT_URI
     )
 
+import mytypes
+
 oauth_data = {
     'client_id': SPORTTRACKS_CLIENT_ID,
     'client_secret': SPORTTRACKS_CLIENT_SECRET,
@@ -346,7 +348,7 @@ def add_workout_from_data(user,importid,data,strokedata,source='sporttracks',
 	times_location = times_distance
 	latcoord = np.zeros(len(times_distance))
 	loncoord = np.zeros(len(times_distance))
-        if workouttype in types.otwtypes:
+        if workouttype in mytypes.otwtypes:
             workouttype = 'rower'
 	
     try:

rowers/tests/mocks.py

@@ -532,6 +532,7 @@ def mocked_requests(*args, **kwargs):
         }
 
     ststrokesjson = json.load(open('rowers/tests/testdata/sporttracksstrokedata.txt','r'))
+    ststrokesjson_nogps = json.load(open('rowers/tests/testdata/sporttracksstrokedatanolocation.txt','r'))
 
     rkstrokesjson = json.load(open('rowers/tests/testdata/rkstrokes.txt','r'))
 
@@ -606,7 +607,7 @@ def mocked_requests(*args, **kwargs):
     stworkoutlistregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities$'
     stworkoutlisttester = re.compile(stworkoutlistregex)
 
-    ststrokesregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/\d+$'
+    ststrokesregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/(\d+)$'
     ststrokestester = re.compile(ststrokesregex)
 
     rkuploadregex = '.*?api\.runkeeper\.com\/fitnessActivities$'
@@ -725,7 +726,10 @@ def mocked_requests(*args, **kwargs):
             }
             return MockResponse(json_data,200)
         if ststrokestester.match(args[0]):
-            return MockResponse(ststrokesjson,200)
+            if ststrokestester.match(args[0]).group(1) == '13':
+                return MockResponse(ststrokesjson_nogps,200)
+            else:
+                return MockResponse(strokesjson,200)
         if stuploadtester.match(args[0]):
             json_data = {
                 "uris": [

rowers/tests/test_imports.py

@@ -421,6 +421,17 @@ class STObjects(DjangoTestCase):
 
         self.assertEqual(response.status_code, 200)
 
+    @patch('rowers.imports.requests.get', side_effect=mocked_requests)
+    def test_sporttracks_import(self, mock_get):
+
+        response = self.c.get('/rowers/workout/sporttracksimport/13/',follow=True)
+
+        self.assertRedirects(response,
+                             expected_url='/rowers/workout/2/edit/',
+                             status_code=302,target_status_code=200)
+
+        self.assertEqual(response.status_code, 200)
+
     @patch('rowers.dataprep.create_engine')
     def test_strokedata(self, mocked_sqlalchemy):
 	with open('rowers/tests/testdata/sporttrackstestdata.txt','r') as infile:

rowers/uploads.py

@@ -59,7 +59,7 @@ def matchsource(line):
         tester = re.compile(testert)
 
         if tester.match(line.lower()):
-            return group(1)
+            return tester.match(line.lower()).group(1)
 
 # currently only matches one chart
 def matchchart(line):