Merge branch 'develop' into feature/magicintervals

rowers/tests/test_imports.py

@@ -255,7 +255,11 @@ class C2Objects(DjangoTestCase):
         wenddtime = self.w.startdatetime+datetime.timedelta(seconds=self.totaltime)
         t1 = arrow.get(wenddtime).timestamp()
         t2 = arrow.get(data['date']).timestamp()
-        diff = np.abs(t1-t2)
+        diff = np.abs(t1-t2+7200)
+        if diff>=2:
+            print(arrow.get(wenddtime))
+            print(arrow.get(data['date']))
+            print('Diff ',diff)
 
 
         self.assertEqual(data['timezone'],'Europe/Amsterdam')
@@ -323,6 +327,29 @@ class C2Objects(DjangoTestCase):
 
         self.assertEqual(response.status_code, 200)
 
+    def test_c2_import_54517340(self):
+        with open('rowers/tests/testdata/c2_54517340.json','r') as infile:
+            data = json.load(infile)
+        (
+            startdatetime,
+            starttime,
+            workoutdate,
+            duration,
+            starttimeunix,
+            timezone
+            ) = utils.get_startdatetime_from_c2data(data)
+
+
+        self.assertEqual(str(timezone),'America/Los_Angeles')
+
+        got = arrow.get(startdatetime).isoformat()
+        want = arrow.get('2021-05-23 09:11:37.100000-07:00').isoformat()
+
+        self.assertEqual(got, want)
+        self.assertEqual(workoutdate,'2021-05-23')
+
+
+
     @patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
     @patch('rowers.dataprep.create_engine')
     def test_c2_import_tz(self, mock_get, mocked_sqlalchemy):