API - fix order by for PGSQL15 support and update tests

fittrackee/tests/fixtures/fixtures_workouts.py

@@ -154,7 +154,9 @@ def seven_workouts_user_1() -> List[Workout]:
     workout_4 = Workout(
         user_id=1,
         sport_id=1,
-        workout_date=datetime.datetime.strptime('23/02/2018', '%d/%m/%Y'),
+        workout_date=datetime.datetime.strptime(
+            '23/02/2018 10:00', '%d/%m/%Y %H:%M'
+        ),
         distance=1,
         duration=datetime.timedelta(seconds=600),
     )

fittrackee/tests/workouts/test_workouts_api_0_get.py

@@ -370,7 +370,7 @@ class TestGetWorkoutsWithPagination(ApiTestCaseMixin):
             seven_workouts_user_1[5].serialize()
         )
         assert data['data']['workouts'][2] == jsonify_dict(
-            seven_workouts_user_1[4].serialize()
+            seven_workouts_user_1[3].serialize()
         )
         assert data['pagination'] == {
             'has_next': True,
@@ -443,7 +443,7 @@ class TestGetWorkoutsWithOrder(ApiTestCaseMixin):
             == data['data']['workouts'][0]['workout_date']
         )
         assert (
-            'Fri, 23 Feb 2018 00:00:00 GMT'
+            'Fri, 23 Feb 2018 10:00:00 GMT'
             == data['data']['workouts'][4]['workout_date']
         )
         assert data['pagination'] == {
@@ -642,11 +642,9 @@ class TestGetWorkoutsWithFilters(ApiTestCaseMixin):
         assert len(data['data']['workouts']) == 2
         assert 'creation_date' in data['data']['workouts'][0]
         assert (
-            'Fri, 23 Feb 2018 00:00:00 GMT'
+            'Fri, 23 Feb 2018 10:00:00 GMT'
             == data['data']['workouts'][0]['workout_date']
         )
-        assert '0:16:40' == data['data']['workouts'][0]['duration']
-        assert 'creation_date' in data['data']['workouts'][1]
         assert (
             'Fri, 23 Feb 2018 00:00:00 GMT'
             == data['data']['workouts'][1]['workout_date']
@@ -849,7 +847,7 @@ class TestGetWorkoutsWithFilters(ApiTestCaseMixin):
         assert 'success' in data['status']
         assert len(data['data']['workouts']) == 1
         assert (
-            'Fri, 23 Feb 2018 00:00:00 GMT'
+            'Fri, 23 Feb 2018 10:00:00 GMT'
             == data['data']['workouts'][0]['workout_date']
         )
         assert data['pagination'] == {

fittrackee/tests/workouts/test_workouts_api_1_post.py

@@ -1019,8 +1019,43 @@ class TestPostWorkoutWithZipArchive(ApiTestCaseMixin):
             assert response.status_code == 201
             assert 'created' in data['status']
             assert len(data['data']['workouts']) == 3
-            assert 'just a workout' == data['data']['workouts'][0]['title']
-            assert_workout_data_with_gpx(data)
+            assert 'creation_date' in data['data']['workouts'][0]
+            assert (
+                'Tue, 13 Mar 2018 12:44:45 GMT'
+                == data['data']['workouts'][0]['workout_date']
+            )
+            assert 'test' == data['data']['workouts'][0]['user']
+            assert 1 == data['data']['workouts'][0]['sport_id']
+            assert '0:04:10' == data['data']['workouts'][0]['duration']
+            assert data['data']['workouts'][0]['ascent'] == 0.4
+            assert data['data']['workouts'][0]['ave_speed'] == 4.61
+            assert data['data']['workouts'][0]['descent'] == 23.4
+            assert data['data']['workouts'][0]['distance'] == 0.32
+            assert data['data']['workouts'][0]['max_alt'] == 998.0
+            assert data['data']['workouts'][0]['max_speed'] == 5.12
+            assert data['data']['workouts'][0]['min_alt'] == 975.0
+            assert data['data']['workouts'][0]['moving'] == '0:04:10'
+            assert data['data']['workouts'][0]['pauses'] is None
+            assert data['data']['workouts'][0]['with_gpx'] is True
+            assert data['data']['workouts'][0]['map'] is not None
+            assert data['data']['workouts'][0]['weather_start'] is None
+            assert data['data']['workouts'][0]['weather_end'] is None
+            assert data['data']['workouts'][0]['notes'] is None
+            assert len(data['data']['workouts'][0]['segments']) == 1
+
+            segment = data['data']['workouts'][0]['segments'][0]
+            assert segment['workout_id'] == data['data']['workouts'][0]['id']
+            assert segment['segment_id'] == 0
+            assert segment['duration'] == '0:04:10'
+            assert segment['ascent'] == 0.4
+            assert segment['ave_speed'] == 4.61
+            assert segment['descent'] == 23.4
+            assert segment['distance'] == 0.32
+            assert segment['max_alt'] == 998.0
+            assert segment['max_speed'] == 5.12
+            assert segment['min_alt'] == 975.0
+            assert segment['moving'] == '0:04:10'
+            assert segment['pauses'] is None
 
     def test_it_returns_400_if_folder_is_present_in_zip_archive(
         self, app: Flask, user_1: User, sport_1_cycling: Sport