API: refactor

mpwo_api/mpwo_api/activities/activities.py

@@ -66,13 +66,10 @@ def get_activity(auth_user_id, activity_id):
     return jsonify(response_object), code
 
 
-@activities_blueprint.route(
+def get_activity_data(auth_user_id, activity_id, data_type):
-    '/activities/<int:activity_id>/gpx', methods=['GET']
+    """Get chart data from an activity gpx file"""
-)
-@authenticate
-def get_activity_gpx(auth_user_id, activity_id):
-    """Get gpx file for an activity"""
     activity = Activity.query.filter_by(id=activity_id).first()
+    content = ''
     if activity:
         if not activity.gpx or activity.gpx == '':
             response_object = {
@@ -82,83 +79,52 @@ def get_activity_gpx(auth_user_id, activity_id):
             return jsonify(response_object), 400
 
         try:
-            with open(activity.gpx, encoding='utf-8') as f:
+            if data_type == 'chart':
-                gpx_content = f.read()
+                content = get_chart_data(activity.gpx)
+            else:  # data_type == 'gpx'
+                with open(activity.gpx, encoding='utf-8') as f:
+                    content = f.read()
         except Exception as e:
             appLog.error(e)
-            response_object = {
+            response_object = {'status': 'error',
-                'status': 'error',
+                               'message': 'internal error',
-                'message': 'internal error',
+                               'data': ({'chart_data': content}
-                'data': {
+                                        if data_type == 'chart'
-                    'gpx': ''
+                                        else {'gpx': content})}
-                }
-            }
             return jsonify(response_object), 500
 
         status = 'success'
         message = ''
         code = 200
     else:
-        gpx_content = ''
         status = 'not found'
         message = f'Activity not found (id: {activity_id})'
         code = 404
 
-    response_object = {
+    response_object = {'status': status,
-        'status': status,
+                       'message': message,
-        'message': message,
+                       'data': ({'chart_data': content}
-        'data': {
+                                if data_type == 'chart'
-            'gpx': gpx_content
+                                else {'gpx': content})}
-        }
-    }
     return jsonify(response_object), code
 
 
+@activities_blueprint.route(
+    '/activities/<int:activity_id>/gpx', methods=['GET']
+)
+@authenticate
+def get_activity_gpx(auth_user_id, activity_id):
+    """Get gpx file for an activity"""
+    return get_activity_data(auth_user_id, activity_id, 'gpx')
+
+
 @activities_blueprint.route(
     '/activities/<int:activity_id>/chart_data', methods=['GET']
 )
 @authenticate
 def get_activity_chart_data(auth_user_id, activity_id):
     """Get chart data from an activity gpx file"""
-    activity = Activity.query.filter_by(id=activity_id).first()
+    return get_activity_data(auth_user_id, activity_id, 'chart')
-    if activity:
-        if not activity.gpx or activity.gpx == '':
-            response_object = {
-                'status': 'fail',
-                'message': f'No gpx file for this activity (id: {activity_id})'
-            }
-            return jsonify(response_object), 400
-
-        try:
-            chart_content = get_chart_data(activity.gpx)
-        except Exception as e:
-            appLog.error(e)
-            response_object = {
-                'status': 'error',
-                'message': 'internal error',
-                'data': {
-                    'chart_data': ''
-                }
-            }
-            return jsonify(response_object), 500
-
-        status = 'success'
-        message = ''
-        code = 200
-    else:
-        chart_content = ''
-        status = 'not found'
-        message = f'Activity not found (id: {activity_id})'
-        code = 404
-
-    response_object = {
-        'status': status,
-        'message': message,
-        'data': {
-            'chart_data': chart_content
-        }
-    }
-    return jsonify(response_object), code
 
 
 @activities_blueprint.route('/activities', methods=['POST'])