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

API: refactor

Browse Source
This commit is contained in:
Sam 2018-06-06 12:16:52 +02:00
parent fa4a094cf3
commit 3621bf87d2
1 changed files with 70 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
mpwo_api/mpwo_api/activities/stats.py
View File

@ -10,10 +10,7 @@ from .models import Activity, Sport, convert_timedelta_to_integer
stats_blueprint = Blueprint('stats', __name__) stats_blueprint = Blueprint('stats', __name__)
@stats_blueprint.route('/stats/<int:user_id>/by_time', methods=['GET']) def get_activities(user_id, type):
@authenticate
def get_activities_by_time(auth_user_id, user_id):
"""Get activities statistics for a user"""
try: try:
user = User.query.filter_by(id=user_id).first() user = User.query.filter_by(id=user_id).first()
if not user: if not user:
@ -26,8 +23,20 @@ def get_activities_by_time(auth_user_id, user_id):
params = request.args.copy() params = request.args.copy()
date_from = params.get('from') date_from = params.get('from')
date_to = params.get('to') date_to = params.get('to')
sport_id = params.get('sport_id')
time = params.get('time') time = params.get('time')
activities_list = {}
if type == 'by_sport':
sport_id = params.get('sport_id')
if sport_id:
sport = Sport.query.filter_by(id=sport_id).first()
if not sport:
print('not sport')
response_object = {
'status': 'not found',
'message': 'Sport does not exist.'
}
return jsonify(response_object), 404
activities = Activity.query.filter( activities = Activity.query.filter(
Activity.user_id == user_id, Activity.user_id == user_id,
@ -35,11 +44,28 @@ def get_activities_by_time(auth_user_id, user_id):
if date_from else True, if date_from else True,
Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d') Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d')
if date_to else True, if date_to else True,
Activity.sport_id == sport_id if sport_id else True,
).order_by( ).order_by(
Activity.activity_date.asc() Activity.activity_date.asc()
).all() ).all()
activities_list = {}
for activity in activities: for activity in activities:
if type == 'by_sport':
sport_id = activity.sport_id
if sport_id not in activities_list:
activities_list[sport_id] = {
'nb_activities': 0,
'total_distance': 0.,
'total_duration': 0,
}
activities_list[sport_id]['nb_activities'] += 1
activities_list[sport_id]['total_distance'] += \
float(activity.distance)
activities_list[sport_id]['total_duration'] += \
convert_timedelta_to_integer(activity.duration)
else:
if time == 'week': if time == 'week':
time_period = datetime.strftime(activity.activity_date, "%Y-W%U") # noqa time_period = datetime.strftime(activity.activity_date, "%Y-W%U") # noqa
elif time == 'weekm': # week start Monday elif time == 'weekm': # week start Monday
@ -47,7 +73,7 @@ def get_activities_by_time(auth_user_id, user_id):
elif time == 'month': elif time == 'month':
time_period = datetime.strftime(activity.activity_date, "%Y-%m") # noqa time_period = datetime.strftime(activity.activity_date, "%Y-%m") # noqa
elif time == 'year' or not time: elif time == 'year' or not time:
time_period = datetime.strftime(activity.activity_date, "%Y") time_period = datetime.strftime(activity.activity_date, "%Y") # noqa
else: else:
response_object = { response_object = {
'status': 'fail', 'status': 'fail',
@ -86,72 +112,14 @@ def get_activities_by_time(auth_user_id, user_id):
return jsonify(response_object), code return jsonify(response_object), code
@stats_blueprint.route('/stats/<int:user_id>/by_time', methods=['GET'])
@authenticate
def get_activities_by_time(auth_user_id, user_id):
"""Get activities statistics for a user"""
return get_activities(user_id, 'by_time')
@stats_blueprint.route('/stats/<int:user_id>/by_sport', methods=['GET']) @stats_blueprint.route('/stats/<int:user_id>/by_sport', methods=['GET'])
@authenticate @authenticate
def get_activities_by_sport(auth_user_id, user_id): def get_activities_by_sport(auth_user_id, user_id):
"""Get activities statistics for a user""" return get_activities(user_id, 'by_sport')
try:
user = User.query.filter_by(id=user_id).first()
if not user:
response_object = {
'status': 'not found',
'message': 'User does not exist.'
}
return jsonify(response_object), 404
params = request.args.copy()
date_from = params.get('from')
date_to = params.get('to')
sport_id = params.get('sport_id')
if sport_id:
sport = Sport.query.filter_by(id=sport_id).first()
if not sport:
print('not sport')
response_object = {
'status': 'not found',
'message': 'Sport does not exist.'
}
return jsonify(response_object), 404
activities = Activity.query.filter(
Activity.user_id == user_id,
Activity.activity_date >= datetime.strptime(date_from, '%Y-%m-%d')
if date_from else True,
Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d')
if date_to else True,
Activity.sport_id == sport_id if sport_id else True,
).order_by(
Activity.activity_date.asc()
).all()
activities_list = {}
for activity in activities:
sport_id = activity.sport_id
if sport_id not in activities_list:
activities_list[sport_id] = {
'nb_activities': 0,
'total_distance': 0.,
'total_duration': 0,
}
activities_list[sport_id]['nb_activities'] += 1
activities_list[sport_id]['total_distance'] += \
float(activity.distance)
activities_list[sport_id]['total_duration'] += \
convert_timedelta_to_integer(activity.duration)
response_object = {
'status': 'success',
'data': {
'statistics': activities_list
}
}
code = 200
except Exception as e:
appLog.error(e)
response_object = {
'status': 'error',
'message': 'Error. Please try again or contact the administrator.'
}
code = 500
return jsonify(response_object), code