Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API - workouts refactoring

Browse Source
This commit is contained in:
Sam
2022-02-16 17:46:22 +01:00
parent 0b2e2ed5dd
commit 1b4a477544
20 changed files with 81 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee/tests/fixtures/fixtures_workouts.py vendored
View File

@ -10,7 +10,7 @@ from werkzeug.datastructures import FileStorage
from fittrackee import db
from fittrackee.workouts.models import Sport, Workout, WorkoutSegment
from fittrackee.workouts.utils import StaticMap
from fittrackee.workouts.utils.maps import StaticMap
byte_io = BytesIO()
Image.new('RGB', (256, 256)).save(byte_io, 'PNG')

0
fittrackee/tests/workouts/test_utils/__init__.py Normal file
View File

6
fittrackee/tests/workouts/test_gpx_utils.py → fittrackee/tests/workouts/test_utils/test_gpx.py
View File

@ -7,7 +7,7 @@ from werkzeug.datastructures import FileStorage
from fittrackee.users.models import User, UserSportPreference
from fittrackee.workouts.models import Sport
from fittrackee.workouts.utils import process_files
from fittrackee.workouts.utils.workouts import process_files
folders = {
'extract_dir': '/tmp/fitTrackee/uploads',
@ -38,7 +38,7 @@ class TestStoppedSpeedThreshold:
expected_threshold: float,
) -> None:
with patch(
'fittrackee.workouts.utils.get_new_file_path',
'fittrackee.workouts.utils.workouts.get_new_file_path',
return_value='/tmp/fitTrackee/uploads/test.png',
), patch(
'gpxpy.gpx.GPXTrackSegment.get_moving_data',
@ -68,7 +68,7 @@ class TestStoppedSpeedThreshold:
expected_threshold = 0.7
user_sport_1_preference.stopped_speed_threshold = expected_threshold
with patch(
'fittrackee.workouts.utils.get_new_file_path',
'fittrackee.workouts.utils.workouts.get_new_file_path',
return_value='/tmp/fitTrackee/uploads/test.png',
), patch(
'gpxpy.gpx.GPXTrackSegment.get_moving_data',

2
fittrackee/tests/workouts/test_workouts_utils.py → fittrackee/tests/workouts/test_utils/test_workouts.py
View File

@ -3,7 +3,7 @@ from typing import List
import pytest
from fittrackee.workouts.utils import get_average_speed
from fittrackee.workouts.utils.workouts import get_average_speed
class TestWorkoutAverageSpeed:

2
fittrackee/tests/workouts/test_workouts_api_1_post.py
View File

@ -11,7 +11,7 @@ from flask import Flask
from fittrackee.users.models import User
from fittrackee.workouts.models import Sport, Workout
from fittrackee.workouts.utils_id import decode_short_id
from fittrackee.workouts.utils.short_id import decode_short_id
from ..api_test_case import ApiTestCaseMixin, CallArgsMixin

2
fittrackee/tests/workouts/test_workouts_api_3_delete.py
View File

@ -3,9 +3,9 @@ import os
from flask import Flask
from fittrackee.files import get_absolute_file_path
from fittrackee.users.models import User
from fittrackee.workouts.models import Sport, Workout
from fittrackee.workouts.utils import get_absolute_file_path
from ..api_test_case import ApiTestCaseMixin
from .utils import get_random_short_id, post_an_workout

2
fittrackee/tests/workouts/test_workouts_model.py
View File

@ -5,7 +5,7 @@ from flask import Flask
from fittrackee import db
from fittrackee.users.models import User
from fittrackee.workouts.models import Sport, Workout
from fittrackee.workouts.utils_id import decode_short_id
from fittrackee.workouts.utils.short_id import decode_short_id
class TestWorkoutModel:

2
fittrackee/tests/workouts/utils.py
View File

@ -5,7 +5,7 @@ from uuid import uuid4
from flask import Flask
from fittrackee.workouts.utils_id import encode_uuid
from fittrackee.workouts.utils.short_id import encode_uuid
def get_random_short_id() -> str: