Merge branch 'dev' into oauth2

fittrackee/workouts/models.py

@@ -12,7 +12,7 @@ from sqlalchemy.orm.mapper import Mapper
 from sqlalchemy.orm.session import Session, object_session
 from sqlalchemy.types import JSON, Enum
 
-from fittrackee import db
+from fittrackee import appLog, db
 from fittrackee.files import get_absolute_file_path
 
 from .utils.convert import convert_in_duration, convert_value_to_integer
@@ -379,9 +379,15 @@ def on_workout_delete(
     @listens_for(db.Session, 'after_flush', once=True)
     def receive_after_flush(session: Session, context: Any) -> None:
         if old_record.map:
-            os.remove(get_absolute_file_path(old_record.map))
+            try:
+                os.remove(get_absolute_file_path(old_record.map))
+            except OSError:
+                appLog.error('map file not found when deleting workout')
         if old_record.gpx:
-            os.remove(get_absolute_file_path(old_record.gpx))
+            try:
+                os.remove(get_absolute_file_path(old_record.gpx))
+            except OSError:
+                appLog.error('gpx file not found when deleting workout')
 
 
 class WorkoutSegment(BaseModel):

fittrackee/workouts/utils/workouts.py

@@ -255,7 +255,7 @@ def get_file_path(dir_path: str, filename: str) -> str:
 def get_new_file_path(
     auth_user_id: int,
     workout_date: str,
-    sport: str,
+    sport_id: int,
     old_filename: Optional[str] = None,
     extension: Optional[str] = None,
 ) -> str:
@@ -265,11 +265,9 @@ def get_new_file_path(
     if not extension and old_filename:
         extension = f".{old_filename.rsplit('.', 1)[1].lower()}"
     _, new_filename = tempfile.mkstemp(
-        prefix=f'{workout_date}_{sport}_', suffix=extension
+        prefix=f'{workout_date}_{sport_id}_', suffix=extension
     )
     dir_path = os.path.join('workouts', str(auth_user_id))
-    if not os.path.exists(dir_path):
-        os.makedirs(dir_path)
     file_path = os.path.join(dir_path, new_filename.split('/')[-1])
     return file_path
 
@@ -285,11 +283,16 @@ def process_one_gpx_file(
             params['file_path'], stopped_speed_threshold
         )
         auth_user = params['auth_user']
+        workout_date, _ = get_workout_datetime(
+            workout_date=gpx_data['start'],
+            date_str_format=None if gpx_data else '%Y-%m-%d %H:%M',
+            user_timezone=None,
+        )
         new_filepath = get_new_file_path(
             auth_user_id=auth_user.id,
-            workout_date=gpx_data['start'],
+            workout_date=workout_date.strftime('%Y-%m-%d_%H-%M-%S'),
             old_filename=filename,
-            sport=params['sport_label'],
+            sport_id=params['sport_id'],
         )
         absolute_gpx_filepath = get_absolute_file_path(new_filepath)
         os.rename(params['file_path'], absolute_gpx_filepath)
@@ -297,9 +300,9 @@ def process_one_gpx_file(
 
         map_filepath = get_new_file_path(
             auth_user_id=auth_user.id,
-            workout_date=gpx_data['start'],
+            workout_date=workout_date.strftime('%Y-%m-%d_%H-%M-%S'),
             extension='.png',
-            sport=params['sport_label'],
+            sport_id=params['sport_id'],
         )
         absolute_map_filepath = get_absolute_file_path(map_filepath)
         generate_map(absolute_map_filepath, map_data)
@@ -397,7 +400,7 @@ def process_files(
         'auth_user': auth_user,
         'workout_data': workout_data,
         'file_path': file_path,
-        'sport_label': sport.label,
+        'sport_id': sport.id,
     }
 
     try:

fittrackee/workouts/workouts.py

@@ -13,7 +13,7 @@ from flask import (
     send_from_directory,
 )
 from sqlalchemy import exc
-from werkzeug.exceptions import RequestEntityTooLarge
+from werkzeug.exceptions import NotFound, RequestEntityTooLarge
 from werkzeug.utils import secure_filename
 
 from fittrackee import appLog, db
@@ -798,6 +798,8 @@ def get_map(map_id: int) -> Union[HttpResponse, Response]:
             current_app.config['UPLOAD_FOLDER'],
             workout.map,
         )
+    except NotFound:
+        return NotFoundErrorResponse('Map file does not exist.')
     except Exception as e:
         return handle_error_and_return_response(e)