From a1c5c344a623563f11423df34da391d98cbd84a4 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 30 Nov 2021 09:02:41 +0100 Subject: [PATCH] [API] minor fix --- fittrackee/tests/users/test_auth_api.py | 2 -- fittrackee/workouts/workouts.py | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fittrackee/tests/users/test_auth_api.py b/fittrackee/tests/users/test_auth_api.py index 0f4d2819..1f96d213 100644 --- a/fittrackee/tests/users/test_auth_api.py +++ b/fittrackee/tests/users/test_auth_api.py @@ -1112,7 +1112,6 @@ class TestUserPicture(ApiTestCaseMixin): ) data = json.loads(response.data.decode()) - print('data', data) assert response.status_code == 413 assert 'fail' in data['status'] assert ( @@ -1144,7 +1143,6 @@ class TestUserPicture(ApiTestCaseMixin): ) data = json.loads(response.data.decode()) - print('data', data) assert response.status_code == 413 assert 'fail' in data['status'] assert ( diff --git a/fittrackee/workouts/workouts.py b/fittrackee/workouts/workouts.py index 3c32ba03..607a65cc 100644 --- a/fittrackee/workouts/workouts.py +++ b/fittrackee/workouts/workouts.py @@ -2,7 +2,7 @@ import json import os import shutil from datetime import timedelta -from typing import Any, Dict, List, Optional, Tuple, Union +from typing import Dict, List, Optional, Tuple, Union import requests from flask import ( @@ -10,7 +10,6 @@ from flask import ( Response, current_app, request, - send_file, send_from_directory, ) from sqlalchemy import exc @@ -770,7 +769,7 @@ def download_workout_gpx( @workouts_blueprint.route('/workouts/map/', methods=['GET']) -def get_map(map_id: int) -> Any: +def get_map(map_id: int) -> Union[HttpResponse, Response]: """ Get map image for workouts with gpx @@ -803,8 +802,10 @@ def get_map(map_id: int) -> Any: workout = Workout.query.filter_by(map_id=map_id).first() if not workout: return NotFoundErrorResponse('Map does not exist.') - absolute_map_filepath = get_absolute_file_path(workout.map) - return send_file(absolute_map_filepath) + return send_from_directory( + current_app.config['UPLOAD_FOLDER'], + workout.map, + ) except Exception as e: return handle_error_and_return_response(e)