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

fix linting issues

Browse Source
This commit is contained in:
Joshua Taillon 2023-05-21 11:29:56 -06:00
parent cef28c52a2
commit 8637ecb203
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fittrackee/tests/fixtures/fixtures_users.py vendored
View File

@ -76,6 +76,7 @@ def user_1_raw_speed() -> User:
db.session.commit() db.session.commit()
return user return user
@pytest.fixture() @pytest.fixture()
def user_1_paris() -> User: def user_1_paris() -> User:
user = User(username='test', email='test@test.com', password='12345678') user = User(username='test', email='test@test.com', password='12345678')

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

@ -54,8 +54,7 @@ class TestStoppedSpeedThreshold:
) )
assert gpx_track_segment_mock.call_args_list[0] == call( assert gpx_track_segment_mock.call_args_list[0] == call(
stopped_speed_threshold=expected_threshold, stopped_speed_threshold=expected_threshold, raw=False
raw=False
) )
gpx_track_segment_mock.assert_called_with( gpx_track_segment_mock.assert_called_with(
expected_threshold, # stopped_speed_threshold expected_threshold, # stopped_speed_threshold
@ -89,8 +88,7 @@ class TestStoppedSpeedThreshold:
) )
assert gpx_track_segment_mock.call_args_list[0] == call( assert gpx_track_segment_mock.call_args_list[0] == call(
stopped_speed_threshold=expected_threshold, stopped_speed_threshold=expected_threshold, raw=False
raw=False
) )
gpx_track_segment_mock.assert_called_with( gpx_track_segment_mock.assert_called_with(
expected_threshold, # stopped_speed_threshold expected_threshold, # stopped_speed_threshold

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

@ -279,7 +279,11 @@ class TestPostWorkoutWithGpx(ApiTestCaseMixin, CallArgsMixin):
assert_workout_data_with_gpx(data) assert_workout_data_with_gpx(data)
def test_it_adds_a_workout_with_gpx_file_raw_speed( def test_it_adds_a_workout_with_gpx_file_raw_speed(
self, app: Flask, user_1_raw_speed: User, sport_1_cycling: Sport, gpx_file: str self,
app: Flask,
user_1_raw_speed: User,
sport_1_cycling: Sport,
gpx_file: str,
) -> None: ) -> None:
client, auth_token = self.get_test_client_and_auth_token( client, auth_token = self.get_test_client_and_auth_token(
app, user_1_raw_speed.email app, user_1_raw_speed.email
@ -301,7 +305,7 @@ class TestPostWorkoutWithGpx(ApiTestCaseMixin, CallArgsMixin):
assert response.status_code == 201 assert response.status_code == 201
assert 'created' in data['status'] assert 'created' in data['status']
assert len(data['data']['workouts']) == 1 assert len(data['data']['workouts']) == 1
# max speed should be slightly higher than that tested in # max speed should be slightly higher than that tested in
# assert_workout_data_with_gpx # assert_workout_data_with_gpx
assert data['data']['workouts'][0]['max_speed'] == pytest.approx(5.25) assert data['data']['workouts'][0]['max_speed'] == pytest.approx(5.25)

2
fittrackee/users/auth.py
View File

@ -893,7 +893,7 @@ def edit_user_preferences(auth_user: User) -> Union[Dict, HttpResponse]:
:<json string language: language preferences :<json string language: language preferences
:<json boolean start_elevation_at_zero: do elevation plots start at zero? :<json boolean start_elevation_at_zero: do elevation plots start at zero?
:<json string timezone: user time zone :<json string timezone: user time zone
:<json boolean use_raw_gpx_speed: Use raw (unfiltered) gpx data to calculate speeds :<json boolean use_raw_gpx_speed: Use unfiltered gpx to calculate speeds
:<json boolean weekm: does week start on Monday? :<json boolean weekm: does week start on Monday?
:reqheader Authorization: OAuth 2.0 Bearer Token :reqheader Authorization: OAuth 2.0 Bearer Token

4
fittrackee/users/models.py
View File

@ -62,9 +62,7 @@ class User(BaseModel):
start_elevation_at_zero = db.Column( start_elevation_at_zero = db.Column(
db.Boolean, default=True, nullable=False db.Boolean, default=True, nullable=False
) )
use_raw_gpx_speed = db.Column( use_raw_gpx_speed = db.Column(db.Boolean, default=False, nullable=False)
db.Boolean, default=False, nullable=False
)
def __repr__(self) -> str: def __repr__(self) -> str:
return f'<User {self.username!r}>' return f'<User {self.username!r}>'

4
fittrackee/workouts/utils/gpx.py
View File

@ -73,7 +73,7 @@ def get_gpx_info(
stopped_speed_threshold: float, stopped_speed_threshold: float,
update_map_data: Optional[bool] = True, update_map_data: Optional[bool] = True,
update_weather_data: Optional[bool] = True, update_weather_data: Optional[bool] = True,
use_raw_gpx_speed: Optional[bool] = False use_raw_gpx_speed: Optional[bool] = False,
) -> Tuple: ) -> Tuple:
""" """
Parse and return gpx, map and weather data from gpx file Parse and return gpx, map and weather data from gpx file
@ -130,7 +130,7 @@ def get_gpx_info(
map_data.append([point.longitude, point.latitude]) map_data.append([point.longitude, point.latitude])
moving_data = segment.get_moving_data( moving_data = segment.get_moving_data(
stopped_speed_threshold=stopped_speed_threshold, stopped_speed_threshold=stopped_speed_threshold,
raw=use_raw_gpx_speed raw=use_raw_gpx_speed,
) )
if moving_data: if moving_data:
calculated_max_speed = moving_data.max_speed calculated_max_speed = moving_data.max_speed

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

@ -303,7 +303,7 @@ def process_one_gpx_file(
gpx_data, map_data, weather_data = get_gpx_info( gpx_data, map_data, weather_data = get_gpx_info(
gpx_file=params['file_path'], gpx_file=params['file_path'],
stopped_speed_threshold=stopped_speed_threshold, stopped_speed_threshold=stopped_speed_threshold,
use_raw_gpx_speed=auth_user.use_raw_gpx_speed use_raw_gpx_speed=auth_user.use_raw_gpx_speed,
) )
workout_date, _ = get_workout_datetime( workout_date, _ = get_workout_datetime(
workout_date=gpx_data['start'], workout_date=gpx_data['start'],