fixed sporttracks bug

rowers/tests/mocks.py

@@ -781,7 +781,7 @@ def mocked_requests(*args, **kwargs):
             if ststrokestester.match(args[0]).group(1) == '13':
                 return MockResponse(ststrokesjson_nogps,200)
             else:
-                return MockResponse(strokesjson,200)
+                return MockResponse(ststrokesjson,200)
         if stuploadtester.match(args[0]):
             json_data = {
                 "uris": [

rowers/tests/test_imports.py

@@ -445,6 +445,19 @@ class STObjects(DjangoTestCase):
 
         self.assertEqual(response.status_code, 200)
 
+    @patch('rowers.imports.requests.get', side_effect=mocked_requests)
+    def test_sporttracks_import_all(self, mock_get):
+
+        response = self.c.get('/rowers/workout/sporttracksimport/all/',follow=True)
+
+        expected_url = reverse('workouts_view')
+
+        self.assertRedirects(response,
+                             expected_url=expected_url,
+                             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/views/importviews.py

@@ -1551,12 +1551,11 @@ def workout_getsporttracksworkout_all(request):
                       ])
         newids = [stid for stid in stids if not stid in knownstids]
         for sporttracksid in newids:
-            res = sporttracksstuff.get_sporttracks_workout(
+            data,strokedata = sporttracksstuff.get_workout(
                 request.user,sporttracksid)
-            data = res.json()
 
-            id,message = add_workout_from_stdata(
-                request.user,sporttracksid,data
+            id,message = sporttracksstuff.add_workout_from_data(
+                request.user,sporttracksid,data,strokedata
             )
             if id==0:
                 messages.error(request,message)