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

Dashboard: init activities display

Browse Source
This commit is contained in:
Sam
2018-05-09 10:25:08 +02:00
parent 1d2966af96
commit 2f0c952ecc
6 changed files with 96 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpwo_api/mpwo_api/activities/activities.py
View File

@ -18,7 +18,8 @@ activities_blueprint = Blueprint('activities', __name__)
@authenticate
def get_activities(auth_user_id):
"""Get all activities for authenticated user"""
activities = Activity.query.filter_by(user_id=auth_user_id).all()
activities = Activity.query.filter_by(user_id=auth_user_id)\
.order_by(Activity.activity_date.desc()).all()
activities_list = []
for activity in activities:
activities_list.append(activity.serialize())

14
mpwo_api/mpwo_api/tests/test_activities.py
View File

@ -51,18 +51,18 @@ def test_get_all_activities_for_authenticated_user(app):
assert len(data['data']['activities']) == 2
assert 'creation_date' in data['data']['activities'][0]
assert 'Mon, 01 Jan 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date'] # noqa
assert 'Sun, 01 Apr 2018 00:00:00 GMT' == data['data']['activities'][0]['activity_date'] # noqa
assert 1 == data['data']['activities'][0]['user_id']
assert 2 == data['data']['activities'][0]['sport_id']
assert '0:17:04' == data['data']['activities'][0]['duration']
assert 1 == data['data']['activities'][0]['sport_id']
assert '1:40:00' == data['data']['activities'][0]['duration']
assert data['data']['activities'][0]['with_gpx'] is False
assert 'creation_date' in data['data']['activities'][1]
assert 'Sun, 01 Apr 2018 00:00:00 GMT' == data['data']['activities'][1]['activity_date'] # noqa
assert 'Mon, 01 Jan 2018 00:00:00 GMT' == data['data']['activities'][1]['activity_date'] # noqa
assert 1 == data['data']['activities'][1]['user_id']
assert 1 == data['data']['activities'][1]['sport_id']
assert '1:40:00' == data['data']['activities'][1]['duration']
assert data['data']['activities'][0]['with_gpx'] is False
assert 2 == data['data']['activities'][1]['sport_id']
assert '0:17:04' == data['data']['activities'][1]['duration']
assert data['data']['activities'][1]['with_gpx'] is False
def test_get_activities_for_authenticated_user_no_activity(app):